From e45a980ce3755b7400f0f0fc7a0eb970d58b8298 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Fri, 10 May 2024 15:44:23 +0200
Subject: [PATCH 001/103] Aggiunto dateTimeRow in ArtDTO

---
 .idea/deploymentTargetSelector.xml                   |  3 ---
 .../gest/contab_doc_interni/dto/ArtDTO.java          | 12 ++++++++++++
 .../edit_form/DocInterniEditFormViewModel.java       |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index cf9149f6..b268ef36 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -2,9 +2,6 @@
 <project version="4">
   <component name="deploymentTargetSelector">
     <selectionStates>
-      <SelectionState runConfigName="Prod_Android.WMS.app">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java
index 4d0a9db1..33b2d4a1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java
@@ -29,8 +29,11 @@ public class ArtDTO {
     private LocalDate dataScad;
 
     private String systemNote;
+
     private String codAlis;
 
+    private Date datetimeRow;
+
     public Integer getRigaOrd() {
         return rigaOrd;
     }
@@ -135,4 +138,13 @@ public class ArtDTO {
         this.codAlis = codAlis;
         return this;
     }
+
+    public Date getDatetimeRow() {
+        return datetimeRow;
+    }
+
+    public ArtDTO setDatetimeRow(Date datetimeRow) {
+        this.datetimeRow = datetimeRow;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
index 3ceab727..c8133c7e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
@@ -240,6 +240,7 @@ public class DocInterniEditFormViewModel {
             artDto.setBarcode(row.getCodBarre());
             artDto.setQta(BigDecimal.valueOf(row.getQtaCol()));
             artDto.setDataIns(row.getDataCollo());
+            artDto.setDatetimeRow(row.getDatetimeRow());
             artDto.setColli(BigDecimal.valueOf(row.getNumCnf()));
             artDto.setUntMis(row.getUntMis());
             artDto.setCodMart(row.getCodMart());

From c616a9d31ab094361acef1f4f706038914109b4b Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 14 May 2024 16:55:45 +0200
Subject: [PATCH 002/103] Fix InputQuantity in rettifica giaccenze

---
 .../RettificaGiacenzeViewModel.java                 | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
index d4ccee63..b8266759 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
@@ -167,8 +167,8 @@ public class RettificaGiacenzeViewModel {
         this.mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> {
             if (onComplete != null) onComplete.run();
 
-            if (mtbAartList != null && mtbAartList.size() > 0) {
-                this.dispatchArts(mtbAartList);
+            if (mtbAartList != null && !mtbAartList.isEmpty()) {
+                this.dispatchArts(mtbAartList, pickData);
             } else {
                 this.sendError(new NoResultFromBarcodeException(barcodeProd));
             }
@@ -189,7 +189,7 @@ public class RettificaGiacenzeViewModel {
                         .map(x -> (MtbAart) x.getMtbAart())
                         .toList();
 
-            dispatchArts(mtbAarts);
+            dispatchArts(mtbAarts, null);
         }, this::sendError);
     }
 
@@ -199,14 +199,13 @@ public class RettificaGiacenzeViewModel {
         mRettificaGiacenzeRESTConsumer.searchArtInt(queryText, listaArts -> {
             this.sendOnLoadingEnded();
 
-            dispatchArts(listaArts);
+            dispatchArts(listaArts, null);
 
             if (onComplete != null) onComplete.run();
         }, this::sendError);
     }
 
-
-    private void dispatchArts(List<MtbAart> artsList) {
+    private void dispatchArts(List<MtbAart> artsList, PickDataDTO pickData) {
         if (artsList == null || artsList.size() == 0) {
             this.sendError(new NoArtsFoundException());
             return;
@@ -219,7 +218,7 @@ public class RettificaGiacenzeViewModel {
                     .toList();
 
             if (matchRows.size() != 1) {
-                dispatchArt(mtbAart, null);
+                dispatchArt(mtbAart, pickData);
             } else {
                 dispatchRowEdit(matchRows.get(0));
             }

From 9abba0ce823a35bfae2711603218e46ed82e1188 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 14 May 2024 16:56:58 +0200
Subject: [PATCH 003/103] -> v.1.40.18 (435)

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

diff --git a/app/build.gradle b/app/build.gradle
index a00464e6..53010628 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 434
-    def appVersionName = '1.40.17'
+    def appVersionCode = 435
+    def appVersionName = '1.40.18'
 
     signingConfigs {
         release {

From 56e56032562c19d31f9af0c4ba6b90444d521674 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 21 May 2024 12:14:03 +0200
Subject: [PATCH 004/103] Fix date in recupero materiale

---
 .idea/runConfigurations/app.xml                    |  2 +-
 .../integrywmsnative/core/model/MtbColr.java       |  5 +++++
 .../integrywmsnative/core/model/MtbColt.java       |  6 ++++++
 .../gest/login/viewmodel/LoginViewModel.java       |  2 +-
 .../ProdRecuperoMaterialeViewModel.java            | 11 +++++------
 .../dto/HistoryVersamentoProdULDTO.java            | 13 +++++++------
 .../dto/HistoryVersamentoProdULRestDTO.java        | 14 +++++++-------
 .../rest/ProdRecuperMaterialeRESTConsumer.java     |  2 +-
 8 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index 72c17371..e0479975 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="WMS_Native.app.main" />
+    <module name="WMS.app.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
index e1b424d0..132d4715 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
@@ -261,6 +261,11 @@ public class MtbColr extends EntityBase {
         return this;
     }
 
+    public MtbColr setDataColloRif(LocalDate dataColloRif) {
+        this.dataColloRif = UtilityDate.formatDate(dataColloRif, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
+        return this;
+    }
+
     public BigDecimal getQtaCnf() {
         return qtaCnf;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
index d7865aed..5a7e9232 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
@@ -10,6 +10,7 @@ import com.annimon.stream.Stream;
 import org.jetbrains.annotations.Nullable;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -170,6 +171,11 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
+    public MtbColt setDataCollo(LocalDate dataCollo) {
+        this.dataCollo = UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
+        return this;
+    }
+
     public String getSerCollo() {
         return serCollo;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java
index 32e2709c..9bdf9748 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java
@@ -90,7 +90,7 @@ public class LoginViewModel {
         this.mSystemRESTConsumer.getAvailableCodMdeps(availableCodMdeps -> {
             SettingsManager.iDB().setAvailableCodMdep(availableCodMdeps);
 
-            if (availableCodMdeps == null || availableCodMdeps.size() == 0) {
+            if (availableCodMdeps == null || availableCodMdeps.isEmpty()) {
                 this.sendError(new InvalidUserDepositException());
                 return;
             }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
index 3e2c3ee9..9436d891 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
@@ -3,13 +3,12 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale;
 import androidx.databinding.ObservableArrayList;
 import androidx.lifecycle.MutableLiveData;
 
-import com.annimon.stream.Stream;
-
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -93,14 +92,14 @@ public class ProdRecuperoMaterialeViewModel {
 
 
     private HistoryVersamentoProdULDTO getHistoryElementFromMtbColt(MtbColt mtbColt) {
-        List<HistoryVersamentoProdULDTO> filteredItems = Stream.of(this.mUlList.getValue())
+        List<HistoryVersamentoProdULDTO> filteredItems = this.mUlList.getValue().stream()
                 .filter(x -> Objects.equals(x.getNumColloRif(), mtbColt.getNumCollo()) &&
-                        x.getDataColloRif().equals(mtbColt.getDataColloS()) &&
+                        x.getDataColloRif().equals(UtilityDate.toLocalDate(mtbColt.getDataColloD())) &&
                         x.getSerColloRif().equalsIgnoreCase(mtbColt.getSerCollo()) &&
                         x.getGestioneRif().equalsIgnoreCase(mtbColt.getGestione()))
-                .toList();
+                .collect(Collectors.toList());
 
-        if (filteredItems != null && filteredItems.size() > 0) {
+        if (!filteredItems.isEmpty()) {
             return filteredItems.get(0);
         }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULDTO.java
index a7d44981..232a68c6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULDTO.java
@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.dto;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -11,7 +12,7 @@ import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 public class HistoryVersamentoProdULDTO {
 
     private String gestione;
-    private String dataCollo;
+    private LocalDate dataCollo;
     private String serCollo;
     private Integer numCollo;
     private String segno;
@@ -28,7 +29,7 @@ public class HistoryVersamentoProdULDTO {
     private String descrizioneArt;
     private String untMis;
     private String gestioneRif;
-    private String dataColloRif;
+    private LocalDate dataColloRif;
     private String serColloRif;
     private Integer numColloRif;
 
@@ -50,11 +51,11 @@ public class HistoryVersamentoProdULDTO {
         return this;
     }
 
-    public String getDataCollo() {
+    public LocalDate getDataCollo() {
         return dataCollo;
     }
 
-    public HistoryVersamentoProdULDTO setDataCollo(String dataCollo) {
+    public HistoryVersamentoProdULDTO setDataCollo(LocalDate dataCollo) {
         this.dataCollo = dataCollo;
         return this;
     }
@@ -203,11 +204,11 @@ public class HistoryVersamentoProdULDTO {
         return this;
     }
 
-    public String getDataColloRif() {
+    public LocalDate getDataColloRif() {
         return dataColloRif;
     }
 
-    public HistoryVersamentoProdULDTO setDataColloRif(String dataColloRif) {
+    public HistoryVersamentoProdULDTO setDataColloRif(LocalDate dataColloRif) {
         this.dataColloRif = dataColloRif;
         return this;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULRestDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULRestDTO.java
index 2c812e76..0209834f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULRestDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULRestDTO.java
@@ -1,16 +1,16 @@
 package it.integry.integrywmsnative.gest.prod_recupero_materiale.dto;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 
-import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 public class HistoryVersamentoProdULRestDTO {
 
 
     private String gestione;
-    private String dataCollo;
+    private LocalDate dataCollo;
     private String serCollo;
     private Integer numCollo;
     private String segno;
@@ -27,7 +27,7 @@ public class HistoryVersamentoProdULRestDTO {
     private String descrizioneArt;
     private String untMis;
     private String gestioneRif;
-    private String dataColloRif;
+    private LocalDate dataColloRif;
     private String serColloRif;
     private Integer numColloRif;
 
@@ -55,11 +55,11 @@ public class HistoryVersamentoProdULRestDTO {
         return this;
     }
 
-    public String getDataCollo() {
+    public LocalDate getDataCollo() {
         return dataCollo;
     }
 
-    public HistoryVersamentoProdULRestDTO setDataCollo(String dataCollo) {
+    public HistoryVersamentoProdULRestDTO setDataCollo(LocalDate dataCollo) {
         this.dataCollo = dataCollo;
         return this;
     }
@@ -208,11 +208,11 @@ public class HistoryVersamentoProdULRestDTO {
         return this;
     }
 
-    public String getDataColloRif() {
+    public LocalDate getDataColloRif() {
         return dataColloRif;
     }
 
-    public HistoryVersamentoProdULRestDTO setDataColloRif(String dataColloRif) {
+    public HistoryVersamentoProdULRestDTO setDataColloRif(LocalDate dataColloRif) {
         this.dataColloRif = dataColloRif;
         return this;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
index c465c62f..bfa6841a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
@@ -264,7 +264,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                     });
 
 
-            if (newUlList.size() > 0) {
+            if (!newUlList.isEmpty()) {
                 List<String> codMarts = Stream.of(newUlList)
                         .map(HistoryVersamentoProdULDTO::getCodMart)
                         .withoutNulls()

From 096219214466573e1a2f3b45f6a26315e910cc33 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 21 May 2024 12:15:29 +0200
Subject: [PATCH 005/103] -> v1.40.19 (436)

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

diff --git a/app/build.gradle b/app/build.gradle
index 53010628..a7486f4c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 435
-    def appVersionName = '1.40.18'
+    def appVersionCode = 436
+    def appVersionName = '1.40.19'
 
     signingConfigs {
         release {

From a9bab6db56bea728faca99df6332e31488080a29 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Mon, 27 May 2024 13:26:11 +0200
Subject: [PATCH 006/103] Fix format LocalDate in recupero materiale

---
 .idea/runConfigurations/app.xml                                 | 2 +-
 .../java/it/integry/integrywmsnative/core/model/MtbColr.java    | 2 +-
 .../java/it/integry/integrywmsnative/core/model/MtbColt.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index e0479975..72c17371 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="WMS.app.main" />
+    <module name="WMS_Native.app.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
index 132d4715..3d97baa6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
@@ -262,7 +262,7 @@ public class MtbColr extends EntityBase {
     }
 
     public MtbColr setDataColloRif(LocalDate dataColloRif) {
-        this.dataColloRif = UtilityDate.formatDate(dataColloRif, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
+        this.dataColloRif = UtilityDate.formatDate(dataColloRif, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
         return this;
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
index 5a7e9232..7d59974f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
@@ -172,7 +172,7 @@ public class MtbColt extends EntityBase {
     }
 
     public MtbColt setDataCollo(LocalDate dataCollo) {
-        this.dataCollo = UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
+        this.dataCollo = UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
         return this;
     }
 

From 76a0fe9b6f2b656dfe344db63c04cdeb94514e41 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Mon, 27 May 2024 13:27:08 +0200
Subject: [PATCH 007/103] -> v1.40.20 (437)

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

diff --git a/app/build.gradle b/app/build.gradle
index a7486f4c..f7f56f14 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 436
-    def appVersionName = '1.40.19'
+    def appVersionCode = 437
+    def appVersionName = '1.40.20'
 
     signingConfigs {
         release {

From 6f61f3af9befbe4889f7589b229e6a6cd4ea70d5 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 28 May 2024 19:07:01 +0200
Subject: [PATCH 008/103] Fix date in recupero materiale

---
 .idea/runConfigurations/app.xml                               | 2 +-
 .../java/it/integry/integrywmsnative/core/model/MtbColt.java  | 4 ++++
 .../ProdRecuperoMaterialeViewModel.java                       | 4 ++--
 .../integrywmsnative/gest/spedizione/SpedizioneViewModel.java | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index 72c17371..e0479975 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="WMS_Native.app.main" />
+    <module name="WMS.app.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
index 7d59974f..6d2dacf5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
@@ -161,6 +161,10 @@ public class MtbColt extends EntityBase {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataColloS());
     }
 
+    public LocalDate getDataColloLD() {
+        return UtilityDate.recognizeLocalDateWithExceptionHandler(getDataColloS());
+    }
+
     public MtbColt setDataCollo(String dataCollo) {
         this.dataCollo = dataCollo;
         return this;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
index 9436d891..737f80ad 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
@@ -94,7 +94,7 @@ public class ProdRecuperoMaterialeViewModel {
     private HistoryVersamentoProdULDTO getHistoryElementFromMtbColt(MtbColt mtbColt) {
         List<HistoryVersamentoProdULDTO> filteredItems = this.mUlList.getValue().stream()
                 .filter(x -> Objects.equals(x.getNumColloRif(), mtbColt.getNumCollo()) &&
-                        x.getDataColloRif().equals(UtilityDate.toLocalDate(mtbColt.getDataColloD())) &&
+                        x.getDataColloRif().equals(mtbColt.getDataColloLD()) &&
                         x.getSerColloRif().equalsIgnoreCase(mtbColt.getSerCollo()) &&
                         x.getGestioneRif().equalsIgnoreCase(mtbColt.getGestione()))
                 .collect(Collectors.toList());
@@ -266,7 +266,7 @@ public class ProdRecuperoMaterialeViewModel {
 
                 if (!Objects.equals(mtbColt.getNumCollo(), item.getNumColloRif()) ||
                         !Objects.equals(mtbColt.getSerCollo(), item.getSerColloRif()) ||
-                        !Objects.equals(mtbColt.getDataColloS(), item.getDataColloRif()) ||
+                        !Objects.equals(mtbColt.getDataColloLD(), item.getDataColloRif()) ||
                         !Objects.equals(mtbColt.getGestione(), item.getGestioneRif())) {
 
                     final MtbColt mtbColtCarico = mtbColt
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 2b3594e2..f6dc1249 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
@@ -813,7 +813,8 @@ public class SpedizioneViewModel {
 
         List<PickingObjectDTO> matchPickingObject = pickingList.stream()
                 .filter(x -> UtilityString.equalsIgnoreCase(mtbAart.getCodMart(), x.getSitArtOrdDTO().getCodMart()))
-                .filter(x -> x.getSitArtOrdDTO().isFlagEnableScanArt()).filter(x -> {
+                .filter(x -> x.getSitArtOrdDTO().isFlagEnableScanArt())
+                .filter(x -> {
                     MtbPartitaMag mtbPartitaMag = pickData != null && pickData.getManualPickDTO() != null && pickData.getManualPickDTO().getMtbPartitaMag() != null ? pickData.getManualPickDTO().getMtbPartitaMag() : null;
                     return !mEnableCheckPartitaMag || (mtbPartitaMag != null && UtilityString.equalsIgnoreCase(x.getSitArtOrdDTO().getPartitaMag(), mtbPartitaMag.getPartitaMag()));
                 }).collect(Collectors.toList());

From efc052d62268aea5405edf5554333c12490746cd Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 28 May 2024 19:07:48 +0200
Subject: [PATCH 009/103] -> v1.40.21 (438)

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

diff --git a/app/build.gradle b/app/build.gradle
index f7f56f14..7947bffd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 437
-    def appVersionName = '1.40.20'
+    def appVersionCode = 438
+    def appVersionName = '1.40.21'
 
     signingConfigs {
         release {

From 05d930d8f7661e3ed7ed60050457b1513da899f8 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Fri, 31 May 2024 18:38:25 +0200
Subject: [PATCH 010/103] Aggiunta setup per "Disabilitare" il picking libero
 quando si spara un'etichetta cartone

---
 .../core/settings/DBSettingsModel.java              | 10 ++++++++++
 .../core/settings/SettingsManager.java              |  6 ++++++
 .../gest/picking_libero/PickingLiberoViewModel.java | 13 +++++++------
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index 0c1f0860..efe86553 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -78,6 +78,7 @@ public class DBSettingsModel {
 
     private boolean flagTracciamentoImballiCaricoEnabled = false;
     private boolean flagTracciamentoImballiScaricoEnabled = false;
+    private boolean flagPickingLiberoEnableScanArt = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -654,4 +655,13 @@ public class DBSettingsModel {
         this.flagTracciamentoImballiScaricoEnabled = flagTracciamentoImballiScaricoEnabled;
         return this;
     }
+
+    public boolean isFlagPickingLiberoEnableScanArt() {
+        return flagPickingLiberoEnableScanArt;
+    }
+
+    public DBSettingsModel setFlagPickingLiberoEnableScanArt(boolean flagPickingLiberoEnableScanArt) {
+        this.flagPickingLiberoEnableScanArt = flagPickingLiberoEnableScanArt;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index bb2c9c7d..2402e061 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -518,6 +518,12 @@ public class SettingsManager {
                 .setKeySection("FLAG_WARNING_NEW_PARTITA_MAG")
                 .setSetter(dbSettingsModelIstance::setFlagWarningNewPartitaMag)
                 .setDefaultValue(false));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("PICKING_LIBERO")
+                .setKeySection("ENABLE_SCAN_ART")
+                .setSetter(dbSettingsModelIstance::setFlagPickingLiberoEnableScanArt)
+                .setDefaultValue(true));
 
         stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
                 .setGestName("PICKING")
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
index 171877f8..8ea43452 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
@@ -14,6 +14,7 @@ import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.core.exception.InvalidCodMdepException;
+import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
 import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
 import it.integry.integrywmsnative.core.exception.ScannedPositionNotExistException;
@@ -137,13 +138,15 @@ public class PickingLiberoViewModel {
             //Cerco tramite etichetta ean 128 (che può indicarmi una UL)
             this.executeEtichettaEan128(barcodeScanDTO, onComplete);
 
-        } else if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
+        } else if (UtilityBarcode.isEanPeso(barcodeScanDTO) && SettingsManager.iDB().isFlagPickingLiberoEnableScanArt()) {
             //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
             this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);
 
-        } else {
+        } else if (SettingsManager.iDB().isFlagPickingLiberoEnableScanArt()){
             //Cerco tramite ean13  un collo  in posizione mono ul definita in anagrafica articolo, altrimenti se abilitato procedo con picking manuale
             this.loadArticolo(barcodeScanDTO.getStringValue(), null, onComplete);
+        } else {
+            this.sendError(new NoArtsFoundException());
         }
     }
 
@@ -269,18 +272,16 @@ public class PickingLiberoViewModel {
             if (!UtilityString.isNullOrEmpty(ean128Model.Content))
                 barcodeProd = ean128Model.Content;
 
-
             if (!UtilityString.isNullOrEmpty(barcodeProd)) {
 
                 if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
                     this.executeEtichettaLU(ean128Model.Sscc, onComplete);
-                } else if (!UtilityString.isNullOrEmpty(barcodeProd)) {
+                } else if (!UtilityString.isNullOrEmpty(barcodeProd) && SettingsManager.iDB().isFlagPickingLiberoEnableScanArt()) {
                     this.loadArticolo(barcodeProd, ean128Model, onComplete);
                 } else {
                     this.sendError(new NoLUFoundException());
                 }
 
-
             } else {
                 //EAN 128 non completo o comunque mancano i riferimenti al prodotto
                 this.sendError(new NoLUFoundException());
@@ -326,7 +327,7 @@ public class PickingLiberoViewModel {
     private void createNewLU_PostClienteAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, Runnable onComplete) {
         if (this.mFlagAskLineaProd) {
             this.sendLULineaProdRequired(response -> {
-                    createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, response.getPosizione(), response.getIdLotto(), onComplete);
+                createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, response.getPosizione(), response.getIdLotto(), onComplete);
 
             }, () -> {
                 this.sendOnLoadingEnded();

From fe558a8be8cdd18dde2d22a3b67e92291a1eeeec Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Fri, 31 May 2024 18:41:02 +0200
Subject: [PATCH 011/103] -> v.1.40.22 (439)

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

diff --git a/app/build.gradle b/app/build.gradle
index 7947bffd..56eb3bf9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 438
-    def appVersionName = '1.40.21'
+    def appVersionCode = 439
+    def appVersionName = '1.40.22'
 
     signingConfigs {
         release {

From 022841c19500da994d78f0b338b35100c0071ed2 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Mon, 17 Jun 2024 17:53:46 +0200
Subject: [PATCH 012/103] Controllo documenti fruma

---
 .../rest/consumers/DocumentRESTConsumer.java  | 18 ++++++-
 .../DocumentiRESTConsumerService.java         |  8 +++-
 .../DocInterniFragment.java                   | 18 ++++++-
 .../DocInterniViewModel.java                  | 47 +++++++++++++++++--
 4 files changed, 80 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java
index 92740653..fc6643db 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java
@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import androidx.annotation.NonNull;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -18,7 +19,7 @@ import retrofit2.Response;
 
 @Singleton
 public class DocumentRESTConsumer extends _BaseRESTConsumer {
-    
+
 
     public void createDocsFromColli(List<LoadColliDTO> listColli, RunnableArgs<List<DtbDoct>> onComplete, RunnableArgs<Exception> onFailed) {
         DocumentiRESTConsumerService documentiRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
@@ -50,8 +51,21 @@ public class DocumentRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public void checkFrumaDocument(String fornitore, String numDoc, String dataDoc, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
+        var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
+        inventarioRESTConsumerService.checkFrumaDoc(fornitore, numDoc, dataDoc)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<Boolean>> call, @NonNull Response<ServiceRESTResponse<Boolean>> response) {
+                        analyzeAnswer(response, "checkDocument", onComplete, onFailed);
+                    }
 
-
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<Boolean>> call, @NonNull Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 
     public void loadDocumentAvailableArts(String codDtip, String codMgrp, String codAnagForn, RunnableArgs<RetrieveDocumentoArtsResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
         var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java
index 2ba2c2d6..bfd9d899 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java
@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.DtbDoct;
@@ -20,8 +21,11 @@ public interface DocumentiRESTConsumerService {
     @POST("createDocFromColli")
     Call<ServiceRESTResponse<DtbDoct>> createDocFromColli(@Body LoadColliDTO listColli);
 
-
-
+    @GET("wms/documento/checkFruma")
+    Call<ServiceRESTResponse<Boolean>> checkFrumaDoc(
+            @Query("fornitore") String fornitore,
+            @Query("numDoc") String numDoc,
+            @Query("dataDoc") String dataDoc);
 
     @GET("wms/documento/arts")
     Call<ServiceRESTResponse<RetrieveDocumentoArtsResponseDTO>> retrieveArts(
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java
index f47d0f26..9b9cc20b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java
@@ -3,6 +3,8 @@ package it.integry.integrywmsnative.gest.contab_doc_interni;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.text.Html;
+import android.text.SpannableString;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -37,6 +39,7 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniE
 import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListAdapter;
 import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListModel;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class DocInterniFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, DocInterniViewModel.Listener {
 
@@ -120,10 +123,21 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment,
         this.openDocumentSelectionDialog();
     }
 
+    @Override
+    public void onWarning(String warningText, Runnable action) {
+        this.requireActivity().runOnUiThread(() -> {
+            this.onLoadingEnded();
+            DialogSimpleMessageView
+                    .makeWarningDialog(new SpannableString(Html.fromHtml(warningText)), null, action)
+                    .show(requireActivity().getSupportFragmentManager(), "tag");
+        });
+    }
+
     @Override
     public void onDocDetailsChanged(DialogSelectDocInfoResponseDTO selection) {
-        mViewModel.setSelectedDocDetails(selection);
-        mBinding.invalidateAll();
+        mViewModel.setSelectedDocDetails(selection, () -> {
+            mBinding.invalidateAll();
+        });
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
index 84a04510..8a00b9c6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
@@ -8,16 +8,22 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
 import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper;
 import it.integry.integrywmsnative.core.di.BindableInteger;
+import it.integry.integrywmsnative.core.exception.NoDocFoundException;
 import it.integry.integrywmsnative.core.exception.NoDocTypeSelectedException;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.documento.DocumentoArtDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoResponseDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.exception.DocumentRequiredException;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GruppoArticoloDTO;
@@ -76,6 +82,14 @@ public class DocInterniViewModel {
         if (this.mListener != null) mListener.onError(ex);
     }
 
+    private void sendWarning(String warningText, Runnable action) {
+        if (this.mListener != null) mListener.onWarning(warningText, action);
+    }
+
+    private void sendDocDetailsChanged(DialogSelectDocInfoResponseDTO selection){
+        if (this.mListener != null) mListener.onDocDetailsChanged(selection);
+    }
+
     public DocInterniViewModel setListeners(Listener listener) {
         this.mListener = listener;
         return this;
@@ -85,7 +99,7 @@ public class DocInterniViewModel {
         return mDocsList;
     }
 
-    public void setSelectedDocDetails(DialogSelectDocInfoResponseDTO selection) {
+    public void setSelectedDocDetails(DialogSelectDocInfoResponseDTO selection, Runnable action) {
         this.fornitore = selection.getFornitore();
         this.dtbTipi = selection.getTipoDoc();
 
@@ -94,10 +108,31 @@ public class DocInterniViewModel {
         this.numDoc = selection.getNumDoc() != null ? selection.getNumDoc().toString() : null;
         this.note = selection.getNote();
 
-        this.sendOnLoadingStarted();
-        fetchProducts(() -> {
-            fetchDocuments(this::sendOnLoadingEnded);
-        });
+        if (dtbTipi.getCodDtip().equalsIgnoreCase("FRUMA")) {
+            documentRESTConsumer.checkFrumaDocument(
+                    fornitore.getCodAnag(),
+                    numDoc,
+                    UtilityDate.formatDate(dataDoc, "yyyy/MM/dd"),
+                    data -> {
+                        if (!data) {
+                            this.sendWarning(UtilityResources.getString(R.string.no_doc_found_message), this::init);
+                        } else {
+                            action.run();
+                            this.sendOnLoadingStarted();
+                            fetchProducts(() -> {
+                                fetchDocuments(this::sendOnLoadingEnded);
+                            });
+                        }
+                    },
+                    this::sendError
+            );
+        } else {
+            action.run();
+            this.sendOnLoadingStarted();
+            fetchProducts(() -> {
+                fetchDocuments(this::sendOnLoadingEnded);
+            });
+        }
     }
 
     public void fetchProducts(Runnable onComplete) {
@@ -210,6 +245,8 @@ public class DocInterniViewModel {
 
         void onError(Exception ex);
 
+        void onWarning(String warningText, Runnable action);
+
         void onDocInterniSetupFetched(DocInterniSetupDTO docInterniSetupDTO);
 
         void onDocDetailsChanged(DialogSelectDocInfoResponseDTO selection);

From 132437d134534c4a0b8ecd2c5c845c3a79631cfa Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Mon, 17 Jun 2024 17:55:10 +0200
Subject: [PATCH 013/103] -> v1.40.23 (440)

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

diff --git a/app/build.gradle b/app/build.gradle
index 56eb3bf9..9d80cbea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 439
-    def appVersionName = '1.40.22'
+    def appVersionCode = 440
+    def appVersionName = '1.40.23'
 
     signingConfigs {
         release {

From f9a31faa7837e0a372677cd46f57d5e9ca05e1e0 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 18 Jun 2024 09:49:23 +0200
Subject: [PATCH 014/103] Fix import docInterni

---
 .../gest/contab_doc_interni/DocInterniViewModel.java           | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
index 8a00b9c6..ffcda8a5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
@@ -13,7 +13,6 @@ import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
 import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper;
 import it.integry.integrywmsnative.core.di.BindableInteger;
-import it.integry.integrywmsnative.core.exception.NoDocFoundException;
 import it.integry.integrywmsnative.core.exception.NoDocTypeSelectedException;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
@@ -21,9 +20,7 @@ import it.integry.integrywmsnative.core.rest.model.documento.DocumentoArtDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
-import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoResponseDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.exception.DocumentRequiredException;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GruppoArticoloDTO;

From 9bf55aae855bc4f23fea15b024c93496b05a6c88 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 18 Jun 2024 09:52:23 +0200
Subject: [PATCH 015/103] -> v1.40.24 (441)

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

diff --git a/app/build.gradle b/app/build.gradle
index 9d80cbea..0774f5f2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 440
-    def appVersionName = '1.40.23'
+    def appVersionCode = 441
+    def appVersionName = '1.40.24'
 
     signingConfigs {
         release {

From a5a9cb1c502c2f277c8d6b8e8adf795f78ed6fe3 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 18 Jun 2024 16:06:02 +0200
Subject: [PATCH 016/103] =?UTF-8?q?Aggiunto=20blocco=20durante=20la=20lett?=
 =?UTF-8?q?ura=20dell'SSCC=20fornitore=20nell'accettazione=20se=20il=20bar?=
 =?UTF-8?q?code=20ul=20=C3=A8=20gi=C3=A0=20presente=20in=20un=20collo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ColliAccettazioneRESTConsumer.java         | 18 ++++++++++++++++++
 .../ColliAccettazioneRESTConsumerService.java  |  5 +++++
 .../ColliLavorazioneRESTConsumer.java          | 18 ++++++++++++++++++
 .../ColliCaricoRESTConsumerInterface.java      |  2 ++
 .../AccettazioneOrdiniPickingActivity.java     | 11 +++++++++++
 .../AccettazioneOrdiniPickingViewModel.java    | 16 ++++++++++++++--
 6 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java
index 91dcdb01..162a00c1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java
@@ -114,4 +114,22 @@ public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements
                 });
     }
 
+    @Override
+    public void checkBarcodeUl(String barcodeUl, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed){
+        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+
+        colliAccettazioneRESTConsumerService.checkIfBarcodeUlAlreadyRegistered(barcodeUl)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
+                        analyzeAnswer(response, "accettazione/checkIfBarcodeUlAlreadyRegistered", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumerService.java
index 42a65b48..5f239012 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumerService.java
@@ -12,7 +12,9 @@ import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowResponseDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
+import retrofit2.http.Query;
 
 public interface ColliAccettazioneRESTConsumerService {
 
@@ -31,4 +33,7 @@ public interface ColliAccettazioneRESTConsumerService {
     @POST("wms/accettazione/deleteUDCRow")
     Call<ServiceRESTResponse<Void>> deleteUDCRow(@Body DeleteUDCRowRequestDTO deleteUDCRowRequestDTO);
 
+    @GET("wms/accettazione/checkIfBarcodeUlAlreadyRegistered")
+    Call<ServiceRESTResponse<Boolean>> checkIfBarcodeUlAlreadyRegistered(@Query("barcodeUl") String barcodeUl);
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java
index 0decfd3a..cacf5a5e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java
@@ -264,4 +264,22 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
                     }
                 });
     }
+
+    @Override
+    public void checkBarcodeUl(String barcodeUl, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed){
+        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+
+        colliAccettazioneRESTConsumerService.checkIfBarcodeUlAlreadyRegistered(barcodeUl)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
+                        analyzeAnswer(response, "accettazione/checkIfBarcodeUlAlreadyRegistered", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/interfaces/ColliCaricoRESTConsumerInterface.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/interfaces/ColliCaricoRESTConsumerInterface.java
index 30d87651..71db8839 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/interfaces/ColliCaricoRESTConsumerInterface.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/interfaces/ColliCaricoRESTConsumerInterface.java
@@ -21,4 +21,6 @@ public interface ColliCaricoRESTConsumerInterface {
     void editUDCRow(EditUDCRowRequestDTO editUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed);
 
     void deleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed);
+
+    void checkBarcodeUl(String barcodeUl, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed);
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
index 3f549c78..78f42a9e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.SpannableString;
 import android.view.Gravity;
 import android.view.Menu;
@@ -741,6 +742,16 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         BarcodeManager.enable();
     }
 
+    @Override
+    public void onWarning(String warningText, Runnable action) {
+        this.runOnUiThread(() -> {
+            this.onLoadingEnded();
+            DialogSimpleMessageView
+                    .makeWarningDialog(new SpannableString(Html.fromHtml(warningText)), null, action)
+                    .show(getSupportFragmentManager(), "tag");
+        });
+    }
+
     @Override
     public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canPartitaMagBeChanged, boolean canOverflowQuantity, String customArtDescription, RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
         DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO().setMtbAart(mtbAart).setInitialNumCnf(initialNumCnf).setInitialQtaCnf(initialQtaCnf).setInitialQtaTot(initialQtaTot).setTotalQtaOrd(totalQtaOrd).setTotalNumCnfOrd(totalNumCnfOrd).setQtaCnfOrd(qtaCnfOrd).setTotalQtaToBeTaken(totalQtaToBeTaken).setTotalNumCnfToBeTaken(totalNumCnfToBeTaken).setQtaCnfToBeTaken(qtaCnfToBeTaken).setTotalQtaAvailable(totalQtaAvailable).setTotalNumCnfAvailable(totalNumCnfAvailable).setQtaCnfAvailable(qtaCnfAvailable).setPartitaMag(partitaMag).setDataScad(dataScad).setCanPartitaMagBeChanged(canPartitaMagBeChanged).setCanLUBeClosed(true).setCanOverflowOrderQuantity(canOverflowQuantity).setCustomArtDescription(customArtDescription);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
index 952a72b5..7ecdec6e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
@@ -247,8 +247,14 @@ public class AccettazioneOrdiniPickingViewModel {
         try {
             Ean128Model ean128Model = mEan128Service.decode(barcodeScanDTO);
 
-            //Nel caso trovo un SSCC lo aggiungo
-            this.processBarcodeNotOpenedLU(barcodeScanDTO, ean128Model.Sscc, onComplete);
+            mColliAccettazioneRESTConsumer.checkBarcodeUl(ean128Model.Sscc, result -> {
+                if (result){
+                    this.sendWarning("Barcode ul già registrato!", onComplete);
+                } else {
+                    //Nel caso trovo un SSCC lo aggiungo
+                    this.processBarcodeNotOpenedLU(barcodeScanDTO, ean128Model.Sscc, onComplete);
+                }
+            }, this::sendError);
 
         } catch (Exception e) {
             this.sendError(e);
@@ -933,6 +939,10 @@ public class AccettazioneOrdiniPickingViewModel {
         if (this.mListener != null) mListener.onError(ex);
     }
 
+    private void sendWarning(String warningText, Runnable action) {
+        if (this.mListener != null) mListener.onWarning(warningText, action);
+    }
+
     private void sendLUOpened(MtbColt mtbColt) {
         if (this.mListener != null) mListener.onLUOpened(mtbColt);
     }
@@ -1050,6 +1060,8 @@ public class AccettazioneOrdiniPickingViewModel {
 
         void onFilterPosizioneApplied(String posizioneToFilter);
 
+        void onWarning(String warningText, Runnable action);
+
         void onULVersata(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete);
 
     }

From da301ec6b2d3ac46a612b56d93f2c90c43a53f5e Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Fri, 21 Jun 2024 17:55:37 +0200
Subject: [PATCH 017/103] Permettere la duplicazione delle uds

---
 .../ColliAccettazioneRESTConsumer.java        |  1 -
 .../ColliLavorazioneRESTConsumer.java         | 18 -----
 .../ColliSpedizioneRESTConsumer.java          | 21 ++++++
 .../ColliSpedizioneRESTConsumerService.java   |  5 ++
 .../ColliCaricoRESTConsumerInterface.java     |  2 -
 .../model/uds/DuplicateUDSRequestDTO.java     | 28 +++++++
 .../model/uds/DuplicateUDSResponseDTO.java    | 19 +++++
 .../core/settings/DBSettingsModel.java        | 10 +++
 .../core/settings/SettingsManager.java        |  5 ++
 .../gest/spedizione/SpedizioneActivity.java   | 12 +++
 .../gest/spedizione/SpedizioneViewModel.java  | 74 ++++++++++++++-----
 11 files changed, 157 insertions(+), 38 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/DuplicateUDSRequestDTO.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/DuplicateUDSResponseDTO.java

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java
index 162a00c1..dc07ca34 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java
@@ -114,7 +114,6 @@ public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements
                 });
     }
 
-    @Override
     public void checkBarcodeUl(String barcodeUl, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed){
         ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java
index cacf5a5e..0decfd3a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java
@@ -264,22 +264,4 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
                     }
                 });
     }
-
-    @Override
-    public void checkBarcodeUl(String barcodeUl, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed){
-        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
-
-        colliAccettazioneRESTConsumerService.checkIfBarcodeUlAlreadyRegistered(barcodeUl)
-                .enqueue(new Callback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
-                        analyzeAnswer(response, "accettazione/checkIfBarcodeUlAlreadyRegistered", onComplete, onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
-                    }
-                });
-    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java
index 962e077b..682f6ed0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -13,6 +15,8 @@ import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
@@ -113,4 +117,21 @@ public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements Co
 
     }
 
+    public void duplicateUDSRow(DuplicateUDSRequestDTO duplicateUDSRequestDTO, RunnableArgs<DuplicateUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
+
+        colliSpedizioneRESTConsumerService.duplicateUDSRow(duplicateUDSRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull Response<ServiceRESTResponse<DuplicateUDSResponseDTO>> response) {
+                        analyzeAnswer(response, "spedizione/duplicateUDSRow", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull Throwable t) {
+                        onFailed.run(new Exception());
+                    }
+                });
+    }
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumerService.java
index 32f0b1fc..5492b609 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumerService.java
@@ -6,6 +6,8 @@ import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
@@ -35,4 +37,7 @@ public interface ColliSpedizioneRESTConsumerService {
     @POST("wms/spedizione/deleteUDSRow")
     Call<ServiceRESTResponse<Void>> deleteUDSRow(@Body DeleteUDSRowRequestDTO deleteUDSRowRequestDTO);
 
+    @POST("wms/spedizione/duplicateUDSRow")
+    Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> duplicateUDSRow(@Body DuplicateUDSRequestDTO duplicateUDSRequestDTO);
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/interfaces/ColliCaricoRESTConsumerInterface.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/interfaces/ColliCaricoRESTConsumerInterface.java
index 71db8839..30d87651 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/interfaces/ColliCaricoRESTConsumerInterface.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/interfaces/ColliCaricoRESTConsumerInterface.java
@@ -21,6 +21,4 @@ public interface ColliCaricoRESTConsumerInterface {
     void editUDCRow(EditUDCRowRequestDTO editUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed);
 
     void deleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed);
-
-    void checkBarcodeUl(String barcodeUl, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed);
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/DuplicateUDSRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/DuplicateUDSRequestDTO.java
new file mode 100644
index 00000000..24c5bc0d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/DuplicateUDSRequestDTO.java
@@ -0,0 +1,28 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class DuplicateUDSRequestDTO {
+
+    private MtbColt mtbColt;
+
+    private int numOfDuplicates;
+
+    public MtbColt getMtbColt() {
+        return mtbColt;
+    }
+
+    public DuplicateUDSRequestDTO setMtbColt(MtbColt mtbColt) {
+        this.mtbColt = mtbColt;
+        return this;
+    }
+
+    public int getNumOfDuplicates() {
+        return numOfDuplicates;
+    }
+
+    public DuplicateUDSRequestDTO setNumOfDuplicates(int numOfDuplicates) {
+        this.numOfDuplicates = numOfDuplicates;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/DuplicateUDSResponseDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/DuplicateUDSResponseDTO.java
new file mode 100644
index 00000000..47d39930
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/DuplicateUDSResponseDTO.java
@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class DuplicateUDSResponseDTO {
+
+    private List<MtbColt> mtbColtList;
+
+    public List<MtbColt> getMtbColtList() {
+        return mtbColtList;
+    }
+
+    public DuplicateUDSResponseDTO setMtbColtList(List<MtbColt> mtbColtList) {
+        this.mtbColtList = mtbColtList;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index efe86553..92760a91 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -79,6 +79,7 @@ public class DBSettingsModel {
     private boolean flagTracciamentoImballiCaricoEnabled = false;
     private boolean flagTracciamentoImballiScaricoEnabled = false;
     private boolean flagPickingLiberoEnableScanArt = false;
+    private boolean flagAskDuplicateUDSSpedizione = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -664,4 +665,13 @@ public class DBSettingsModel {
         this.flagPickingLiberoEnableScanArt = flagPickingLiberoEnableScanArt;
         return this;
     }
+
+    public boolean isFlagAskDuplicateUDSSpedizione() {
+        return flagAskDuplicateUDSSpedizione;
+    }
+
+    public DBSettingsModel setFlagAskDuplicateUDSSpedizione(boolean flagAskDuplicateUDSSpedizione) {
+        this.flagAskDuplicateUDSSpedizione = flagAskDuplicateUDSSpedizione;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index 2402e061..d1ebd35a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -388,6 +388,11 @@ public class SettingsManager {
                 .setSection("SPEDIZIONE")
                 .setKeySection("FLAG_ASK_INFO_AGGIUNTIVE")
                 .setSetter(dbSettingsModelIstance::setFlagAskInfoAggiuntiveSpedizione));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("FLAG_ASK_DUPLICATE_UDS")
+                .setSetter(dbSettingsModelIstance::setFlagAskDuplicateUDSSpedizione));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index d2022ba4..d775ef0a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -1072,4 +1072,16 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         DialogInfoAggiuntiveLUView.newInstance(mtbColt, onComplete, this::onLoadingEnded)
                 .show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
     }
+
+    @Override
+    public void onInputDuplicate(RunnableArgs<Integer> onComplete){
+        DialogSimpleInputHelper.makeInputDialog(this, "Numero pedane da duplicare", inputValue -> {
+            try {
+                Integer num = Integer.parseInt(inputValue);
+                onComplete.run(num);
+            } catch (NumberFormatException ex) {
+                this.onError(new Exception("Inserire un numero di risorse valido"));
+            }
+        }, () -> {}).show();
+    }
 }
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 f6dc1249..3780c29e 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
@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.gest.spedizione;
 
+import androidx.annotation.IntegerRes;
 import androidx.databinding.ObservableArrayList;
 import androidx.lifecycle.MutableLiveData;
 
@@ -13,6 +14,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
@@ -72,6 +74,7 @@ import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestOrderDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.PrintULRequestDTO;
@@ -1549,31 +1552,35 @@ public class SpedizioneViewModel {
 
                     this.closeLU(generatedMtbColts -> {
 
-                        this.mColliMagazzinoRESTConsumer.fillMtbAartsOfMtbColts(generatedMtbColts, filledMtbColts -> {
+                        this.duplicateUDS(generatedMtbColts, duplicatedMtbColts -> {
 
-                            this.askPositionChange(
-                                    filledMtbColts,
-                                    positionedMtbColts -> {
+                            generatedMtbColts.addAll(duplicatedMtbColts);
 
-                                        this.askPrint((shouldPrint && SettingsManager.iDB().isFlagPrintEtichetteOnLUClose()), positionedMtbColts, () -> {
-                                            positionedMtbColts.stream()
-                                                    .filter(x -> !this.mColliRegistrati.contains(x))
-                                                    .forEach(x -> this.mColliRegistrati.add(x));
+                            this.mColliMagazzinoRESTConsumer.fillMtbAartsOfMtbColts(generatedMtbColts, filledMtbColts -> {
 
-                                            postCloseOperations(positionedMtbColts);
+                                this.askPositionChange(
+                                        filledMtbColts,
+                                        positionedMtbColts -> {
 
-                                            this.mIsNewLU = false;
+                                            this.askPrint((shouldPrint && SettingsManager.iDB().isFlagPrintEtichetteOnLUClose()), positionedMtbColts, () -> {
+                                                positionedMtbColts.stream()
+                                                        .filter(x -> !this.mColliRegistrati.contains(x))
+                                                        .forEach(x -> this.mColliRegistrati.add(x));
+
+                                                postCloseOperations(positionedMtbColts);
+
+                                                this.mIsNewLU = false;
+
+                                                this.resetMatchedRows();
+                                                this.sendLUClosed();
+                                                this.sendOnLoadingEnded();
+                                            });
 
-                                            this.resetMatchedRows();
-                                            this.sendLUClosed();
-                                            this.sendOnLoadingEnded();
                                         });
 
-                                    });
-
-                        }, this::sendError);
+                            }, this::sendError);
+                        });
                     });
-
                 });
             });
         });
@@ -1596,8 +1603,35 @@ public class SpedizioneViewModel {
         this.mColliScaricoRESTConsumer.closeUDS(closeUDSRequestDto, closeResponse -> {
             onComplete.run(closeResponse.getGeneratedMtbColts());
         }, this::sendError);
+    }
 
+    private void duplicateUDS(List<MtbColt> mtbColtList, RunnableArgs<List<MtbColt>> onComplete) {
+        var clonedLu = (MtbColt) this.mCurrentMtbColt.clone();
 
+        boolean noReference = clonedLu.getMtbColr().stream()
+                .allMatch(
+                        x -> x.getGestioneRif() == null &&
+                                x.getDataColloRifD() == null &&
+                                x.getSerColloRif() == null &&
+                                x.getNumColloRif() == null
+                );
+
+        if (mtbColtList.size() > 1 || !noReference || !SettingsManager.iDB().isFlagAskDuplicateUDSSpedizione()) {
+            onComplete.run(new ArrayList<>());
+            return;
+        }
+
+        var savedMtbColt = mtbColtList.get(0);
+
+        sendInputDuplicate(inputNumber -> {
+            var duplicateUDSRequestDTO = new DuplicateUDSRequestDTO()
+                    .setMtbColt(savedMtbColt)
+                    .setNumOfDuplicates(inputNumber);
+
+            this.mColliSpedizioneRESTConsumer.duplicateUDSRow(duplicateUDSRequestDTO, data -> {
+                onComplete.run(data.getMtbColtList());
+            }, this::sendError);
+        });
     }
 
     private void checkIfShouldBeDeleted(Runnable onDeleted, Runnable onContinue) {
@@ -1938,6 +1972,10 @@ public class SpedizioneViewModel {
         this.mDocumentRESTConsumer.createDocFromColli(loadCollidto, doc -> this.sendOnOrderClosed(), this::sendError);
     }
 
+    private void sendInputDuplicate(RunnableArgs<Integer> onComplete) {
+        if (this.mListener != null) mListener.onInputDuplicate(onComplete);
+    }
+
     public SpedizioneViewModel setListeners(Listener listener) {
         this.mListener = listener;
         return this;
@@ -1970,6 +2008,8 @@ public class SpedizioneViewModel {
         void onChooseArtsRequest(List<MtbAart> artsList, RunnableArgs<List<MtbAart>> onComplete);
 
         void onOrderClosed();
+
+        void onInputDuplicate(RunnableArgs<Integer> onComplete);
     }
 
 }

From 8a5c8f5c94f206621deb7a3060f8c7995f98de39 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 25 Jun 2024 09:06:02 +0200
Subject: [PATCH 018/103] -> v1.40.25 (442)

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

diff --git a/app/build.gradle b/app/build.gradle
index 0774f5f2..f7541cbf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 441
-    def appVersionName = '1.40.24'
+    def appVersionCode = 442
+    def appVersionName = '1.40.25'
 
     signingConfigs {
         release {

From 4f490eb737fe7242ca60033a68ac42a0f064b5e1 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Wed, 26 Jun 2024 12:16:46 +0200
Subject: [PATCH 019/103] =?UTF-8?q?In=20accettazione=20da=20bolla=20inseri?=
 =?UTF-8?q?ta=20ricerca=20per=20descrizione=20articolo=20e=20aggiunta=20co?=
 =?UTF-8?q?nferma=20della=20quantit=C3=A0=20al=20long=20click?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccettazioneBollaPickingActivity.java     | 97 +++++++++++++++++--
 .../AccettazioneBollaPickingBindings.java     | 22 +++++
 .../AccettazioneBollaPickingViewModel.java    | 67 ++++++++-----
 ...cettazioneBollaPickingFilterViewModel.java | 75 ++++++++++++++
 .../AccettazioneBollaPickingListAdapter.java  | 10 ++
 5 files changed, 235 insertions(+), 36 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingBindings.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
index 7710b378..6ae8b99d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
@@ -22,6 +22,8 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 import javax.inject.Inject;
 
@@ -33,6 +35,7 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.data_cache.DataCache;
 import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
+import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
@@ -54,11 +57,15 @@ import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.SitBo
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.TestataBollaAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.AccettazioneBollaPickingOrderBy;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.PickingObjectDTO;
+import it.integry.integrywmsnative.gest.accettazione_bolla_picking.filters.AccettazioneBollaPickingFilterViewModel;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.ui.AccettazioneBollaPickingListAdapter;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.ui.AccettazioneBollaPickingListModel;
+import it.integry.integrywmsnative.gest.accettazione_ordini_picking.filters.FilterDescrLayoutView;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
 import it.integry.integrywmsnative.view.dialogs.ask_should_versamento_automatico_ul.DialogAskShouldVersamentoAutomaticoULView;
@@ -82,8 +89,9 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
     private ActivityAccettazioneBollaPickingBinding mBindings;
 
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
-
-
+    
+    private final AccettazioneBollaPickingFilterViewModel mAppliedFilterViewModel = new AccettazioneBollaPickingFilterViewModel();
+    
     private final ObservableArrayList<AccettazioneBollaPickingListModel> mAccettazioneMutableData = new ObservableArrayList<>();
 
     public BindableBoolean noItemsToPick = new BindableBoolean(false);
@@ -150,7 +158,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         this.initVars();
         this.initBarcodeReader();
         this.initRecyclerView();
-//        this.initFilters();
+        this.initFilters();
         this.initFab();
 
         boolean useQtaBolla = SettingsManager.iDB().isFlagAccettazioneBollaUseQtaOrd();
@@ -201,16 +209,85 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         this.mBindings.accettazionePickingList.setAdapter(adapter);
 
         this.mViewModel.getPickingList().observe(this, updatedData -> {
-//            mAppliedFilterViewModel.init(updatedData);
+            mAppliedFilterViewModel.init(updatedData);
 
             refreshList();
         });
 
+        adapter.setOnLongClickListener(clickedItem -> {
+            this.mViewModel.dispatchBollaRow(clickedItem, true);
+        });
+
         adapter.setOnItemClicked(clickedItem -> {
             this.mViewModel.dispatchBollaRow(clickedItem);
         });
     }
 
+    private void initFilters() {
+
+        var onPredicateChanged = new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                refreshList();
+            }
+        };
+        
+        mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(onPredicateChanged);
+
+        List<FilterChipDTO> filterList = Stream.of(AccettazioneBollaPickingBindings.AVAILABLE_FILTERS.entrySet()).map(Map.Entry::getValue).sortBy(FilterChipDTO::getPosizione).toList();
+
+        for (FilterChipDTO filterChipDTO : filterList) {
+
+            FilterChipView filterChipView = new FilterChipView(this, filterChipDTO.getFilterChipText(), v -> initBottomSheetDialogFilter(filterChipDTO));
+
+            if (filterChipDTO.getID() == AccettazioneBollaPickingBindings.DESCR_FILTER_ID) {
+                mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+                    @Override
+                    public void run() {
+                        if (mAppliedFilterViewModel.getCurrentDescrPredicate().get() == null) {
+                            mViewModel.resetMatchedRows();
+                            filterChipView.disableCloseIcon();
+
+                            mBindings.filterChipsGroup.removeView(filterChipView);
+                            mBindings.filterChipsGroup.addView(filterChipView);
+                            mBindings.filterChips.smoothScrollTo(0, 0);
+                        } else {
+                            filterChipView.enableCloseIcon();
+
+                            mBindings.filterChipsGroup.removeView(filterChipView);
+                            mBindings.filterChipsGroup.addView(filterChipView, 0);
+                            mBindings.filterChips.smoothScrollTo(0, 0);
+                        }
+                    }
+                });
+                filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentDescrPredicate().set(null));
+            }
+
+            this.mBindings.filterChipsGroup.addView(filterChipView);
+        }
+    }
+
+    private void initBottomSheetDialogFilter(FilterChipDTO filterChipDTO) {
+
+        filterChipDTO.getFilterLayoutView().setFilterName(filterChipDTO.getFilterChipText()).setContext(this);
+
+        var filterLayoutView = filterChipDTO.getFilterLayoutView();
+
+        if (filterChipDTO.getID() == AccettazioneBollaPickingBindings.DESCR_FILTER_ID) {
+            ((FilterDescrLayoutView) filterLayoutView)
+                    .setAll(mAppliedFilterViewModel.getAllDescrs())
+                    .setAvailable(mAppliedFilterViewModel.getAvailableDescrs())
+                    .setOnFilterApplied(mAppliedFilterViewModel::setDescrFilter)
+                    .setPreselected(
+                            Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue()))
+                                    .filter(mAppliedFilterViewModel.getCurrentDescrPredicate().get() == null ? x -> false : Objects.requireNonNull(mAppliedFilterViewModel.getCurrentDescrPredicate().get()))
+                                    .map(x -> x.getMtbAart().getDescrizioneEstesa()).toList()
+                    );
+        }
+
+
+        if (!filterLayoutView.isAdded()) filterLayoutView.show(getSupportFragmentManager(), "TAG");
+    }
 
     private void initFab() {
         fabPopupMenu = new PopupMenu(this, this.mBindings.accettazioneOrdineInevasoFab,
@@ -246,13 +323,13 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         runOnUiThread(() -> {
             List<PickingObjectDTO> tmpList;
 
-//            if (mAppliedFilterViewModel != null) {
-//                mAppliedFilterViewModel.applyAllTests();
-//                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
-//            } else {
+            if (mAppliedFilterViewModel != null) {
+                mAppliedFilterViewModel.applyAllTests();
+                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
+            } else {
             tmpList = mViewModel.getPickingList().getValue();
-//            }
-//
+            }
+
             var list = convertDataModelToListModel(tmpList);
 
             this.mAccettazioneMutableData.clear();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingBindings.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingBindings.java
new file mode 100644
index 00000000..40df6a37
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingBindings.java
@@ -0,0 +1,22 @@
+package it.integry.integrywmsnative.gest.accettazione_bolla_picking;
+
+import java.util.HashMap;
+
+import it.integry.integrywmsnative.gest.accettazione_ordini_picking.filters.FilterDescrLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
+
+public class AccettazioneBollaPickingBindings {
+
+    public static final int DESCR_FILTER_ID = 0;
+
+    public static final HashMap<Integer, FilterChipDTO> AVAILABLE_FILTERS = new HashMap<>() {
+        {
+
+            put(DESCR_FILTER_ID, new FilterChipDTO()
+                    .setID(DESCR_FILTER_ID)
+                    .setPosizione(1)
+                    .setFilterChipText("Descrizione articolo")
+                    .setFilterLayoutView(new FilterDescrLayoutView()));
+        }
+    };
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
index ad521005..6e8b80eb 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
@@ -443,7 +443,11 @@ public class AccettazioneBollaPickingViewModel {
         dispatchBollaRow(pickingObjectDTO);
     }
 
-    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO) {
+    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO){
+        dispatchBollaRow(pickingObjectDTO, false);
+    }
+
+    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO, boolean longClick) {
         if (this.mCurrentMtbColt == null) return;
 
         AtomicBigDecimal numCnfWithdrawRows = new AtomicBigDecimal();
@@ -578,31 +582,42 @@ public class AccettazioneBollaPickingViewModel {
             }
         }
 
-        this.sendOnItemDispatched(
-                pickingObjectDTO,
-                pickingObjectDTO.getMtbAart(),
-                initialNumCnf, initialQtaCnf, initialQtaTot,
-                qtaDaEvadere,
-                numCnfDaEvadere,
-                qtaCnfDaEvadere,
-                qtaColDaPrelevare,
-                numCnfDaPrelevare,
-                qtaCnfDaPrelevare,
-                null,
-                null,
-                null,
-                partitaMag,
-                dataScad,
-                true,
-                (pickedQuantityDTO, shouldCloseLU) -> {
-                    this.saveNewRow(pickingObjectDTO,
-                            pickedQuantityDTO.getNumCnf(),
-                            pickedQuantityDTO.getQtaCnf(),
-                            pickedQuantityDTO.getQtaTot(),
-                            pickedQuantityDTO.getPartitaMag(),
-                            pickedQuantityDTO.getDataScad(),
-                            shouldCloseLU);
-                });
+        if (!longClick){
+            this.sendOnItemDispatched(
+                    pickingObjectDTO,
+                    pickingObjectDTO.getMtbAart(),
+                    initialNumCnf, initialQtaCnf, initialQtaTot,
+                    qtaDaEvadere,
+                    numCnfDaEvadere,
+                    qtaCnfDaEvadere,
+                    qtaColDaPrelevare,
+                    numCnfDaPrelevare,
+                    qtaCnfDaPrelevare,
+                    null,
+                    null,
+                    null,
+                    partitaMag,
+                    dataScad,
+                    true,
+                    (pickedQuantityDTO, shouldCloseLU) -> {
+                        this.saveNewRow(pickingObjectDTO,
+                                pickedQuantityDTO.getNumCnf(),
+                                pickedQuantityDTO.getQtaCnf(),
+                                pickedQuantityDTO.getQtaTot(),
+                                pickedQuantityDTO.getPartitaMag(),
+                                pickedQuantityDTO.getDataScad(),
+                                shouldCloseLU);
+                    });
+        } else {
+            this.saveNewRow(
+                    pickingObjectDTO,
+                    initialNumCnf,
+                    initialQtaCnf,
+                    initialQtaTot,
+                    partitaMag,
+                    dataScad,
+                    false);
+        }
 
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java
new file mode 100644
index 00000000..6280da7f
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java
@@ -0,0 +1,75 @@
+package it.integry.integrywmsnative.gest.accettazione_bolla_picking.filters;
+
+import androidx.databinding.ObservableField;
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.Stream;
+import com.annimon.stream.function.Predicate;
+
+import java.util.List;
+import java.util.Objects;
+
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.PickingObjectDTO;
+
+public class AccettazioneBollaPickingFilterViewModel {
+    private final ObservableField<Predicate<PickingObjectDTO>> currentDescrPredicate = new ObservableField<>();
+
+    private List<PickingObjectDTO> initialOrderList;
+    private final MutableLiveData<List<PickingObjectDTO>> currentFilteredOrderList = new MutableLiveData<>();
+
+    public void init(List<PickingObjectDTO> initialList) {
+        this.initialOrderList = initialList;
+        this.currentFilteredOrderList.setValue(this.initialOrderList);
+    }
+
+    public MutableLiveData<List<PickingObjectDTO>> getMutableFilteredOrderList() {
+        return this.currentFilteredOrderList;
+    }
+
+
+    public void setDescrFilter(List<String> descrs) {
+        if (descrs == null || descrs.isEmpty()) currentDescrPredicate.set(null);
+        else {
+            currentDescrPredicate.set(o -> descrs.contains(o.getMtbAart().getDescrizione()));
+        }
+    }
+
+    public void applyAllTests() {
+
+        List<PickingObjectDTO> returnList;
+
+        if (currentDescrPredicate.get() == null) {
+            returnList = this.initialOrderList;
+        } else {
+            Stream<PickingObjectDTO> tmpStream = Stream.of(this.initialOrderList)
+                    .filter(x ->(currentDescrPredicate.get() == null || (currentDescrPredicate.get().test(x)))
+                    );
+
+            returnList = tmpStream.toList();
+        }
+
+        this.currentFilteredOrderList.setValue(returnList);
+    }
+
+    public ObservableField<Predicate<PickingObjectDTO>> getCurrentDescrPredicate() {
+        return currentDescrPredicate;
+    }
+
+    public List<String> getAllDescrs() {
+        return Stream
+                .of(Objects.requireNonNull(initialOrderList))
+                .filter(x -> x.getMtbAart().getDescrizioneEstesa() != null)
+                .sortBy(x -> x.getMtbAart().getDescrizioneEstesa())
+                .map(x -> x.getMtbAart().getDescrizioneEstesa() != null ? x.getMtbAart().getDescrizioneEstesa() : null)
+                .distinct()
+                .toList();
+    }
+
+    public List<String> getAvailableDescrs() {
+        return Stream.of(this.initialOrderList)
+                .map(x -> x.getMtbAart().getDescrizioneEstesa())
+                .distinct()
+                .toList();
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
index 1d6ca3bb..bf8f8a83 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
@@ -33,6 +33,7 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
     private final List<AccettazioneBollaPickingListModel> mDataset = new ArrayList<>();
 
     private RunnableArgs<PickingObjectDTO> mOnItemClicked;
+    private RunnableArgs<PickingObjectDTO> mOnItemLongClicked;
 
     static class SubheaderHolder extends RecyclerView.ViewHolder {
 
@@ -75,6 +76,9 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
         this.mOnItemClicked = onItemClicked;
     }
 
+    public void setOnLongClickListener(RunnableArgs<PickingObjectDTO> onItemLongClicked){
+        this.mOnItemLongClicked = onItemLongClicked;
+    }
 
     @Override
     public AccettazioneBollaPickingListAdapter.SubheaderHolder onCreateSubheaderViewHolder(ViewGroup parent, int viewType) {
@@ -160,6 +164,12 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
             if (this.mOnItemClicked != null)
                 this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel());
         });
+
+        holder.mBinding.getRoot().setOnLongClickListener(v -> {
+            if (this.mOnItemLongClicked != null)
+                this.mOnItemLongClicked.run(pickingObjectDTO.getOriginalModel());
+            return true;
+        });
     }
 
     @Override

From 074fb10b4417a7b6b9644cd513d70418122cb9f7 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Wed, 26 Jun 2024 16:03:07 +0200
Subject: [PATCH 020/103] Fix chiamata servizi duplicateUDS

---
 .../core/rest/consumers/ColliSpedizioneRESTConsumer.java    | 6 +++---
 .../rest/consumers/ColliSpedizioneRESTConsumerService.java  | 4 ++--
 .../gest/spedizione/SpedizioneViewModel.java                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java
index 682f6ed0..a44d8bc2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java
@@ -117,14 +117,14 @@ public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements Co
 
     }
 
-    public void duplicateUDSRow(DuplicateUDSRequestDTO duplicateUDSRequestDTO, RunnableArgs<DuplicateUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+    public void duplicateUDS(DuplicateUDSRequestDTO duplicateUDSRequestDTO, RunnableArgs<DuplicateUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
-        colliSpedizioneRESTConsumerService.duplicateUDSRow(duplicateUDSRequestDTO)
+        colliSpedizioneRESTConsumerService.duplicateUDS(duplicateUDSRequestDTO)
                 .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull Response<ServiceRESTResponse<DuplicateUDSResponseDTO>> response) {
-                        analyzeAnswer(response, "spedizione/duplicateUDSRow", onComplete, onFailed);
+                        analyzeAnswer(response, "spedizione/duplicateUDS", onComplete, onFailed);
                     }
 
                     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumerService.java
index 5492b609..b80f725d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumerService.java
@@ -37,7 +37,7 @@ public interface ColliSpedizioneRESTConsumerService {
     @POST("wms/spedizione/deleteUDSRow")
     Call<ServiceRESTResponse<Void>> deleteUDSRow(@Body DeleteUDSRowRequestDTO deleteUDSRowRequestDTO);
 
-    @POST("wms/spedizione/duplicateUDSRow")
-    Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> duplicateUDSRow(@Body DuplicateUDSRequestDTO duplicateUDSRequestDTO);
+    @POST("wms/spedizione/duplicateUDS")
+    Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> duplicateUDS(@Body DuplicateUDSRequestDTO duplicateUDSRequestDTO);
 
 }
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 3780c29e..c4e3d310 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
@@ -1628,7 +1628,7 @@ public class SpedizioneViewModel {
                     .setMtbColt(savedMtbColt)
                     .setNumOfDuplicates(inputNumber);
 
-            this.mColliSpedizioneRESTConsumer.duplicateUDSRow(duplicateUDSRequestDTO, data -> {
+            this.mColliSpedizioneRESTConsumer.duplicateUDS(duplicateUDSRequestDTO, data -> {
                 onComplete.run(data.getMtbColtList());
             }, this::sendError);
         });

From 74a3749e44bf9a80e4acd02426cd096f99f409ad Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Wed, 26 Jun 2024 16:13:43 +0200
Subject: [PATCH 021/103] -> v1.40.26 (443)

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

diff --git a/app/build.gradle b/app/build.gradle
index f7541cbf..e23a1106 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 442
-    def appVersionName = '1.40.25'
+    def appVersionCode = 443
+    def appVersionName = '1.40.26'
 
     signingConfigs {
         release {

From bc788c3a34a6815bd67f3ad0daa366f4e9cf3033 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Fri, 5 Jul 2024 17:57:19 +0200
Subject: [PATCH 022/103] =?UTF-8?q?[DOLBO]=20Gestito=20extra=20quantity=20?=
 =?UTF-8?q?in=20duplica=20uds=20e=20aggiornamento=20quantit=C3=A0=20in=20e?=
 =?UTF-8?q?lenco?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/settings/DBSettingsModel.java        |  10 ++
 .../core/settings/SettingsManager.java        |   5 +
 .../AccettazioneOrdiniPickingViewModel.java   |   2 +-
 .../gest/spedizione/SpedizioneActivity.java   |  33 +++++-
 .../gest/spedizione/SpedizioneViewModel.java  | 110 +++++++++++++-----
 5 files changed, 125 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index 92760a91..6e09f913 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -34,6 +34,7 @@ public class DBSettingsModel {
     private boolean flagSpedizioneCanSelectMultipleOrders;
     private List<String> notePerditaDocInterni = new ArrayList<>();
     private boolean flagSpedizioneUseQtaOrd;
+    private boolean flagSpedizioneUseColliPedana;
     private boolean flagOrdinaNuoviArticoliInGriglia;
     private boolean flagOrdinaArticoliOnScan;
     private boolean flagConsentiFuoriPianoLogistico;
@@ -270,6 +271,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public boolean isFlagSpedizioneUseColliPedana() {
+        return flagSpedizioneUseColliPedana;
+    }
+
+    public DBSettingsModel setFlagSpedizioneUseColliPedana(boolean flagSpedizioneUseColliPedana) {
+        this.flagSpedizioneUseColliPedana = flagSpedizioneUseColliPedana;
+        return this;
+    }
+
     public DBSettingsModel setFlagOrdinaNuoviArticoliInGriglia(boolean flagOrdinaNuoviArticoliInGriglia) {
         this.flagOrdinaNuoviArticoliInGriglia = flagOrdinaNuoviArticoliInGriglia;
         return this;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index d1ebd35a..0a722da0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -315,6 +315,11 @@ public class SettingsManager {
                 .setSection("SPEDIZIONE")
                 .setKeySection("FLAG_USE_QTA_ORD")
                 .setSetter(dbSettingsModelIstance::setFlagSpedizioneUseQtaOrd));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("FLAG_USE_COLLI_PEDANA")
+                .setSetter(dbSettingsModelIstance::setFlagSpedizioneUseColliPedana));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Integer.class)
                 .setGestName("PICKING")
                 .setSection("SETUP")
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
index 7ecdec6e..68bff77b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
@@ -556,7 +556,7 @@ public class AccettazioneOrdiniPickingViewModel {
 
         if (dataScad == null && pickingObjectDTO.getMtbAart().getGgScadPartita() != null && pickingObjectDTO.getMtbAart().getGgScadPartita() > 0) {
             dataScad = UtilityDate.getNow();
-            dataScad.plusDays(pickingObjectDTO.getMtbAart().getGgScadPartita());
+            dataScad = dataScad.plusDays(pickingObjectDTO.getMtbAart().getGgScadPartita());
         }
 
         if (partitaMag == null && dataScad == null) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index d775ef0a..bc3b3aa6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.SpannableString;
 import android.view.Gravity;
 import android.widget.Toast;
@@ -80,6 +81,7 @@ import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAgg
 import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowQtaTotOrderedQuantityException;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtView;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiView;
 import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
@@ -211,6 +213,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         boolean canOverflowOrderQuantity = SettingsManager.iDB().isFlagCanAddExtraQuantitySpedizione();
         boolean shouldAskPesoLU = SettingsManager.iDB().isFlagAskPesoColloSpedizione();
         boolean useQtaOrd = SettingsManager.iDB().isFlagSpedizioneUseQtaOrd();
+        boolean useColliPedana = SettingsManager.iDB().isFlagSpedizioneUseColliPedana();
 
         mViewmodel.init(
                 codMdep,
@@ -223,7 +226,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 mColliRegistrati,
                 mGestioneCol, mSegnoCol, mDefaultCausaleUL,
                 mEnableQuantityReset,
-                useQtaOrd);
+                useQtaOrd,
+                useColliPedana);
 
     }
 
@@ -280,7 +284,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
             fabPopupMenu.getMenu().removeItem(R.id.close_order);
         }
 
-        if(!SettingsManager.iDB().isFlagTracciamentoImballiScaricoEnabled())
+        if (!SettingsManager.iDB().isFlagTracciamentoImballiScaricoEnabled())
             fabPopupMenu.getMenu().removeItem(R.id.track_packaging);
 
         fabPopupMenu.setOnMenuItemClickListener(item -> {
@@ -886,6 +890,11 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                                      boolean canPartitaMagBeChanged,
                                      RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
 
+        if (dataScad == null && pickingObjectDTO.getMtbAart().getGgScadPartita() != null && pickingObjectDTO.getMtbAart().getGgScadPartita() > 0) {
+            dataScad = UtilityDate.getNow();
+            dataScad = dataScad.plusDays(pickingObjectDTO.getMtbAart().getGgScadPartita());
+        }
+
         DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
                 .setMtbAart(mtbAart)
                 .setInitialNumCnf(initialNumCnf)
@@ -1074,7 +1083,23 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     }
 
     @Override
-    public void onInputDuplicate(RunnableArgs<Integer> onComplete){
+    public void onInputDuplicate(BigDecimal qtaTot, BigDecimal qtaEvasa, RunnableArgs<Integer> onComplete, Runnable onNegativeClick) {
+        String textWarning = UtilityResources.getString(R.string.ordered_quantity_overflow_error_message);
+
+        dialogInputQuantityToDuplicate(inputNumber -> {
+            if (qtaTot != null && qtaEvasa != null && UtilityBigDecimal.equalsOrGreaterThan(qtaEvasa.multiply(BigDecimal.valueOf(inputNumber)), qtaTot)) {
+
+                DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(textWarning)),
+                        null,
+                        () -> this.onInputDuplicate(qtaTot, qtaEvasa, onComplete, onNegativeClick)
+                ).show(getSupportFragmentManager(), "tag");
+            } else {
+                onComplete.run(inputNumber);
+            }
+        }, onNegativeClick);
+    }
+
+    private void dialogInputQuantityToDuplicate(RunnableArgs<Integer> onComplete, Runnable onNegativeClick) {
         DialogSimpleInputHelper.makeInputDialog(this, "Numero pedane da duplicare", inputValue -> {
             try {
                 Integer num = Integer.parseInt(inputValue);
@@ -1082,6 +1107,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
             } catch (NumberFormatException ex) {
                 this.onError(new Exception("Inserire un numero di risorse valido"));
             }
-        }, () -> {}).show();
+        }, onNegativeClick).show();
     }
 }
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 c4e3d310..df15bc45 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
@@ -10,7 +10,9 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -19,6 +21,7 @@ import java.util.stream.Stream;
 import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
 import it.integry.integrywmsnative.core.exception.EmptyLUException;
@@ -79,10 +82,12 @@ import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.PrintULRequestDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UntMisUtils;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityPosizione;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.CurrentMonoLUPositionIsNotCorrectException;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidMagazzinoAutomaticoMovementException;
@@ -92,6 +97,7 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.OrdersLoadExceptio
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowQtaTotOrderedQuantityException;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.TracciamentoImballoDTO;
 
 public class SpedizioneViewModel {
@@ -117,6 +123,7 @@ public class SpedizioneViewModel {
     private boolean mIsNewLU;
     private boolean mEnableQuantityReset;
     private boolean mUseQtaOrd;
+    private boolean mUseColliPedana;
     private boolean mIsOrdTrasf = false;
 
     private MtbColt mCurrentMtbColt = null;
@@ -165,7 +172,7 @@ public class SpedizioneViewModel {
     }
 
 
-    public void init(String codMdep, boolean enableGiacenza, boolean enableCheckPartitaMag, boolean shouldAskPesoLU, boolean canOverflowOrderQuantity, List<SitArtOrdDTO> pickingList, List<OrdineUscitaInevasoDTO> testateOrdini, List<MtbColt> colliRegistrati, GestioneEnum gestioneCol, int segnoCol, Integer defaultCausaleUL, boolean enableQuantityReset, boolean useQtaOrd) {
+    public void init(String codMdep, boolean enableGiacenza, boolean enableCheckPartitaMag, boolean shouldAskPesoLU, boolean canOverflowOrderQuantity, List<SitArtOrdDTO> pickingList, List<OrdineUscitaInevasoDTO> testateOrdini, List<MtbColt> colliRegistrati, GestioneEnum gestioneCol, int segnoCol, Integer defaultCausaleUL, boolean enableQuantityReset, boolean useQtaOrd, boolean useColliPedana) {
         this.sendOnLoadingStarted();
 
         this.mDefaultCodMdep = codMdep;
@@ -178,6 +185,7 @@ public class SpedizioneViewModel {
         this.mDefaultCausaleOfUL = defaultCausaleUL;
         this.mEnableQuantityReset = enableQuantityReset;
         this.mUseQtaOrd = useQtaOrd;
+        this.mUseColliPedana = useColliPedana;
 
         if (enableGiacenza) {
             mOrdiniRestConsumerService.getSuggestedPickingList(this.mDefaultCodMdep, pickingList, pickingObjectList -> {
@@ -985,20 +993,6 @@ public class SpedizioneViewModel {
             refMtbColt = pickingObjectDTO.getMtbColts().get(0);
         }
 
-//        MtbColr refMtbColr = null;
-//
-//        if (scannedMtbColr != null && refMtbColt != null && refMtbColt.getMtbColr().size() > 0) {
-//            Optional<MtbColr> optionalMtbColr = Stream.of(refMtbColt.getMtbColr())
-//                    .filter(y -> UtilityString.equalsIgnoreCase(y.getCodMart(), scannedMtbColr.getCodMart()) &&
-//                            UtilityString.equalsIgnoreCase(y.getCodTagl(), scannedMtbColr.getCodTagl()) &&
-//                            UtilityString.equalsIgnoreCase(y.getCodCol(), scannedMtbColr.getCodCol()) &&
-//                            (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(y.getPartitaMag(), scannedMtbColr.getPartitaMag()) || UtilityString.isNullOrEmpty(scannedMtbColr.getPartitaMag())))
-//                    .findFirst();
-//
-//            if (optionalMtbColr.isPresent()) refMtbColr = optionalMtbColr.get();
-//        }
-
-
         if (refMtbColr != null) {
             if (pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) {
                 if (UtilityBigDecimal.equalsOrLowerThan(refMtbColr.getQtaCol(), qtaDaEvadere)) {
@@ -1086,8 +1080,12 @@ public class SpedizioneViewModel {
             }
         }
 
+        BigDecimal initialNumCnf = mUseColliPedana ? pickingObjectDTO.getMtbAart().getColliPedana() : mUseQtaOrd ? numCnfDaPrelevare : null;
+        BigDecimal initialQtaCnf = mUseColliPedana ? pickingObjectDTO.getMtbAart().getQtaCnf() : mUseQtaOrd ? qtaCnfDaPrelevare : null;
+        BigDecimal initialQtaTot = mUseColliPedana ? initialNumCnf.multiply(initialQtaCnf) : mUseQtaOrd ? qtaColDaPrelevare : null;
+
         MtbColt finalRefMtbColt = refMtbColt;
-        this.onItemDispatched(pickingObjectDTO, pickingObjectDTO.getMtbAart(), mUseQtaOrd ? numCnfDaPrelevare : null, mUseQtaOrd ? qtaCnfDaPrelevare : null, mUseQtaOrd ? qtaColDaPrelevare : null, qtaDaEvadere, numCnfDaEvadere, qtaCnfDaEvadere, qtaColDaPrelevare, numCnfDaPrelevare, qtaCnfDaPrelevare, totalQtaAvailable, totalNumCnfAvailable, qtaCnfAvailable, partitaMag, dataScad, mCanOverflowOrderQuantity, canPartitaMagBeChanged, (pickedQuantityDTO, shouldCloseLU) -> {
+        this.onItemDispatched(pickingObjectDTO, pickingObjectDTO.getMtbAart(), initialNumCnf, initialQtaCnf, initialQtaTot, qtaDaEvadere, numCnfDaEvadere, qtaCnfDaEvadere, qtaColDaPrelevare, numCnfDaPrelevare, qtaCnfDaPrelevare, totalQtaAvailable, totalNumCnfAvailable, qtaCnfAvailable, partitaMag, dataScad, mCanOverflowOrderQuantity, canPartitaMagBeChanged, (pickedQuantityDTO, shouldCloseLU) -> {
             this.saveNewRow(pickingObjectDTO, finalRefMtbColt, pickedQuantityDTO.getNumCnf(), pickedQuantityDTO.getQtaCnf(), pickedQuantityDTO.getQtaTot(), pickedQuantityDTO.getPartitaMag(), pickedQuantityDTO.getDataScad(), shouldCloseLU);
         });
     }
@@ -1552,9 +1550,11 @@ public class SpedizioneViewModel {
 
                     this.closeLU(generatedMtbColts -> {
 
-                        this.duplicateUDS(generatedMtbColts, duplicatedMtbColts -> {
+                        this.validateTheUdsToBeDuplicated(generatedMtbColts, duplicatedMtbColts -> {
 
-                            generatedMtbColts.addAll(duplicatedMtbColts);
+                            if (duplicatedMtbColts != null) {
+                                generatedMtbColts.addAll(duplicatedMtbColts);
+                            }
 
                             this.mColliMagazzinoRESTConsumer.fillMtbAartsOfMtbColts(generatedMtbColts, filledMtbColts -> {
 
@@ -1605,7 +1605,7 @@ public class SpedizioneViewModel {
         }, this::sendError);
     }
 
-    private void duplicateUDS(List<MtbColt> mtbColtList, RunnableArgs<List<MtbColt>> onComplete) {
+    private void validateTheUdsToBeDuplicated(List<MtbColt> mtbColtList, RunnableArgs<List<MtbColt>> onComplete) {
         var clonedLu = (MtbColt) this.mCurrentMtbColt.clone();
 
         boolean noReference = clonedLu.getMtbColr().stream()
@@ -1623,15 +1623,59 @@ public class SpedizioneViewModel {
 
         var savedMtbColt = mtbColtList.get(0);
 
-        sendInputDuplicate(inputNumber -> {
-            var duplicateUDSRequestDTO = new DuplicateUDSRequestDTO()
-                    .setMtbColt(savedMtbColt)
-                    .setNumOfDuplicates(inputNumber);
+        //Controllo se si va in extra quantity
+        if (!SettingsManager.iDB().isFlagCanAddExtraQuantitySpedizione()) {
+            Map<String, List<MtbColr>> groupedByCodMart = savedMtbColt.getMtbColr()
+                    .stream()
+                    .filter(x -> x.getCodMart() != null)
+                    .collect(Collectors.groupingBy(MtbColr::getCodMart));
 
-            this.mColliSpedizioneRESTConsumer.duplicateUDS(duplicateUDSRequestDTO, data -> {
-                onComplete.run(data.getMtbColtList());
-            }, this::sendError);
-        });
+            for (PickingObjectDTO pickingObjectDTO : Objects.requireNonNull(this.mPickingList.getValue())) {
+
+                if (pickingObjectDTO.getMtbAart() != null) {
+                    String codMart = pickingObjectDTO.getMtbAart().getCodMart();
+
+                    if (groupedByCodMart.containsKey(codMart)) {
+                        BigDecimal qtaTot = UntMisUtils.shouldBeShowInColli(pickingObjectDTO.getMtbAart()) ? pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd() : pickingObjectDTO.getSitArtOrdDTO().getQtaOrd();
+
+                        BigDecimal qtaEvasa = Objects.requireNonNull(groupedByCodMart.get(codMart)).stream().map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+                        sendInputDuplicate(qtaTot, qtaEvasa, inputNumber -> {
+                            duplicateUDS(savedMtbColt, inputNumber, onComplete);
+                        }, () -> onComplete.run(null));
+                    }
+                }
+            }
+        } else {
+            sendInputDuplicate(inputNumber -> {
+                duplicateUDS(savedMtbColt, inputNumber, onComplete);
+            }, () -> onComplete.run(null));
+        }
+    }
+
+    private void duplicateUDS(MtbColt savedMtbColt, Integer inputNumber, RunnableArgs<List<MtbColt>> onComplete){
+        var duplicateUDSRequestDTO = new DuplicateUDSRequestDTO()
+                .setMtbColt(savedMtbColt)
+                .setNumOfDuplicates(inputNumber);
+
+        this.mColliSpedizioneRESTConsumer.duplicateUDS(duplicateUDSRequestDTO, data -> {
+            Map<String, List<MtbColr>> groupedByCodMart = data.getMtbColtList()
+                    .stream()
+                    .flatMap(x -> x.getMtbColr().stream())
+                    .filter(x -> x.getCodMart() != null)
+                    .collect(Collectors.groupingBy(MtbColr::getCodMart));
+
+            for (PickingObjectDTO pickingObjectDTO : Objects.requireNonNull(this.mPickingList.getValue())) {
+                if (pickingObjectDTO.getMtbAart() != null) {
+                    String codMart = pickingObjectDTO.getMtbAart().getCodMart();
+                    if (groupedByCodMart.containsKey(codMart)) {
+                        pickingObjectDTO.getWithdrawMtbColrs()
+                                .addAll(Objects.requireNonNull(groupedByCodMart.get(codMart)));
+                    }
+                }
+            }
+            onComplete.run(data.getMtbColtList());
+        }, this::sendError);
     }
 
     private void checkIfShouldBeDeleted(Runnable onDeleted, Runnable onContinue) {
@@ -1972,8 +2016,14 @@ public class SpedizioneViewModel {
         this.mDocumentRESTConsumer.createDocFromColli(loadCollidto, doc -> this.sendOnOrderClosed(), this::sendError);
     }
 
-    private void sendInputDuplicate(RunnableArgs<Integer> onComplete) {
-        if (this.mListener != null) mListener.onInputDuplicate(onComplete);
+    private void sendInputDuplicate(BigDecimal qtaTot, BigDecimal qtaEvasa, RunnableArgs<Integer> onComplete, Runnable onNegativeClick) {
+        if (this.mListener != null)
+            mListener.onInputDuplicate(qtaTot, qtaEvasa, onComplete, onNegativeClick);
+    }
+
+    private void sendInputDuplicate(RunnableArgs<Integer> onComplete, Runnable onNegativeClick) {
+        if (this.mListener != null)
+            mListener.onInputDuplicate(null, null, onComplete, onNegativeClick);
     }
 
     public SpedizioneViewModel setListeners(Listener listener) {
@@ -2009,7 +2059,7 @@ public class SpedizioneViewModel {
 
         void onOrderClosed();
 
-        void onInputDuplicate(RunnableArgs<Integer> onComplete);
+        void onInputDuplicate(BigDecimal qtaTot, BigDecimal qtaEvasa, RunnableArgs<Integer> onComplete, Runnable onNegativeClick);
     }
 
 }

From 7b11f503d8cc0324d083936cf7038597f4415ac0 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Fri, 5 Jul 2024 17:58:49 +0200
Subject: [PATCH 023/103] -> v1.40.27 (444)

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

diff --git a/app/build.gradle b/app/build.gradle
index e23a1106..5f786a03 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 443
-    def appVersionName = '1.40.26'
+    def appVersionCode = 444
+    def appVersionName = '1.40.27'
 
     signingConfigs {
         release {

From c548c6484f1c3082b9a39e200dfaf06633f4fee2 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Fri, 19 Jul 2024 17:55:14 +0200
Subject: [PATCH 024/103] Aggiunto suggerimento data scadenza in caso di
 partita esistente

---
 .../rest/consumers/MagazzinoRESTConsumer.java | 22 ++++++++++
 .../MagazzinoRESTConsumerService.java         |  7 ++-
 .../core/settings/DBSettingsModel.java        | 11 +++++
 .../core/settings/SettingsManager.java        |  6 +++
 .../gest/spedizione/SpedizioneActivity.java   |  3 +-
 .../gest/spedizione/SpedizioneModule.java     |  7 ++-
 .../gest/spedizione/SpedizioneViewModel.java  | 32 ++++++++++++--
 .../DialogInputQuantityV2DTO.java             | 13 ++++++
 .../DialogInputQuantityV2View.java            |  6 ++-
 .../DialogInputQuantityV2ViewModel.java       | 43 +++++++++++++++++++
 10 files changed, 137 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java
index af1b4f46..602ce4b0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java
@@ -1,13 +1,19 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
+import java.util.Date;
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -59,4 +65,20 @@ public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
             }
         });
     }
+
+    public void retrieveAllPartitaMag(List<String> codMarts, Date dataScad, RunnableArgs<List<MtbPartitaMag>> onComplete, RunnableArgs<Exception> onFailed) {
+        MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class);
+        service.retrieveAllPartitaMag(codMarts, UtilityDate.formatDate(dataScad, UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH))
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<List<MtbPartitaMag>>> call, @NonNull Response<ServiceRESTResponse<List<MtbPartitaMag>>> response) {
+                        analyzeAnswer(response, "retrieveAllPartitaMag", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<List<MtbPartitaMag>>> call, @NonNull Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumerService.java
index 2797ffee..60cd5dbd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumerService.java
@@ -3,14 +3,12 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
-import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 public interface MagazzinoRESTConsumerService {
@@ -22,6 +20,7 @@ public interface MagazzinoRESTConsumerService {
     Call<ServiceRESTResponse<MtbPartitaMag>> retrievePartitaMag(@Query("codMart") String codMart,
                                                                 @Query("partitaMag") String partitaMag);
 
-
-
+    @POST("wms/partita-magazzino/retrieveAllPartitaMag")
+    Call<ServiceRESTResponse<List<MtbPartitaMag>>> retrieveAllPartitaMag(@Body List<String> codMarts,
+                                                                         @Query("dataScad") String dataScad);
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index 6e09f913..5f2448bb 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -82,6 +82,8 @@ public class DBSettingsModel {
     private boolean flagPickingLiberoEnableScanArt = false;
     private boolean flagAskDuplicateUDSSpedizione = false;
 
+    private boolean suggestDataScad = false;
+
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
     }
@@ -684,4 +686,13 @@ public class DBSettingsModel {
         this.flagAskDuplicateUDSSpedizione = flagAskDuplicateUDSSpedizione;
         return this;
     }
+
+    public boolean isSuggestDataScad() {
+        return suggestDataScad;
+    }
+
+    public DBSettingsModel setSuggestDataScad(boolean suggestDataScad) {
+        this.suggestDataScad = suggestDataScad;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index 0a722da0..7a85f68a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -456,6 +456,12 @@ public class SettingsManager {
                 .setKeySection("GENERA_DOC")
                 .setSetter(dbSettingsModelIstance::setFlagGeneraDocumentoSpedizione)
                 .setDefaultValue(false));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("SUGGEST_DATA_SCAD")
+                .setSetter(dbSettingsModelIstance::setSuggestDataScad)
+                .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE_BOLLA")
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index bc3b3aa6..2ca1a6a5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -916,7 +916,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 .setCanLUBeClosed(true)
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
                 .setStatoPartitaMag(pickingObjectDTO != null ? pickingObjectDTO.getStatoArticoloDTO() : null)
-                .setNotifyProductLotStatus(SettingsManager.iDB().isNotifyLotStatus());
+                .setNotifyProductLotStatus(SettingsManager.iDB().isNotifyLotStatus())
+                .setMtbPartitaMagList(mViewmodel.getmPartitaMagList());
 
         if (!mDialogInputQuantityV2View.isVisible())
             mDialogInputQuantityV2View
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java
index dad4a875..e2f150e2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java
@@ -11,6 +11,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliSpedizioneRESTConsum
 import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
@@ -36,7 +37,8 @@ public class SpedizioneModule {
                                                     ColliSpedizioneRESTConsumer colliSpedizioneRESTConsumer,
                                                     ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
                                                     MagazzinoAutomaticoRESTConsumer magazzinoAutomaticoRESTConsumer,
-                                                    ImballiRESTConsumer imballiRESTConsumer) {
+                                                    ImballiRESTConsumer imballiRESTConsumer,
+                                                    MagazzinoRESTConsumer magazzinoRESTConsumer) {
         return new SpedizioneViewModel(articoloRESTConsumer,
                 barcodeRESTConsumer,
                 colliDataRecoverService,
@@ -48,7 +50,8 @@ public class SpedizioneModule {
                 colliSpedizioneRESTConsumer,
                 colliLavorazioneRESTConsumer,
                 magazzinoAutomaticoRESTConsumer,
-                imballiRESTConsumer);
+                imballiRESTConsumer,
+                magazzinoRESTConsumer);
     }
 
 }
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 df15bc45..52d48cfb 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
@@ -10,6 +10,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -59,6 +60,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliSpedizioneRESTConsum
 import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
@@ -105,6 +107,7 @@ public class SpedizioneViewModel {
     private List<OrdineUscitaInevasoDTO> mTestateOrdini;
     private MutableLiveData<List<PickingObjectDTO>> mPickingList = new MutableLiveData<>();
     private List<MtbColt> mColliRegistrati = new ArrayList<>();
+    private List<MtbPartitaMag> mPartitaMagList = new ArrayList<>();
 
     private Listener mListener;
 
@@ -143,6 +146,7 @@ public class SpedizioneViewModel {
     private final ImballiRESTConsumer mImballiRESTConsumer;
 
     private ColliScaricoRESTConsumerInterface mColliScaricoRESTConsumer;
+    private MagazzinoRESTConsumer magazzinoRESTConsumer;
 
     @Inject
     public SpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer,
@@ -156,7 +160,8 @@ public class SpedizioneViewModel {
                                ColliSpedizioneRESTConsumer colliSpedizioneRESTConsumer,
                                ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
                                MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer,
-                               ImballiRESTConsumer imballiRESTConsumer) {
+                               ImballiRESTConsumer imballiRESTConsumer,
+                               MagazzinoRESTConsumer magazzinoRESTConsumer) {
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
         this.mColliDataRecoverService = colliDataRecoverService;
@@ -169,6 +174,7 @@ public class SpedizioneViewModel {
         this.mColliLavorazioneRESTConsumer = colliLavorazioneRESTConsumer;
         this.mMagazzinoAutomaticoRESTConsumer = mMagazzinoAutomaticoRESTConsumer;
         this.mImballiRESTConsumer = imballiRESTConsumer;
+        this.magazzinoRESTConsumer = magazzinoRESTConsumer;
     }
 
 
@@ -190,21 +196,35 @@ public class SpedizioneViewModel {
         if (enableGiacenza) {
             mOrdiniRestConsumerService.getSuggestedPickingList(this.mDefaultCodMdep, pickingList, pickingObjectList -> {
                 this.mPickingList.postValue(pickingObjectList);
-                this.sendOnLoadingEnded();
             }, ex -> this.sendError(new OrdersLoadException(ex)));
         } else {
             getEmptyPickingList(pickingList, pickingObjectList -> {
                 this.mPickingList.postValue(pickingObjectList);
-                this.sendOnLoadingEnded();
             });
         }
 
+        getPartitaMagList(pickingList, mtbPartitaMagList -> {
+            this.mPartitaMagList = mtbPartitaMagList;
+            this.sendOnLoadingEnded();
+        });
+
         this.mDefaultGestioneOfUL = gestioneCol;
         this.mDefaultSegnoCol = segnoCol;
 
         this.initDefaultVars();
     }
 
+    private void getPartitaMagList(List<SitArtOrdDTO> sitArtOrdList, RunnableArgs<List<MtbPartitaMag>> onComplete) {
+        if (SettingsManager.iDB().isSuggestDataScad()) {
+            List<String> codMarts = sitArtOrdList.stream()
+                    .map(x -> x.getCodMart().trim())
+                    .collect(Collectors.toList());
+
+            this.magazzinoRESTConsumer.retrieveAllPartitaMag(codMarts, new Date(), onComplete, this::sendError);
+        } else {
+            onComplete.run(new ArrayList<>());
+        }
+    }
 
     private void getEmptyPickingList(List<SitArtOrdDTO> sitArtOrdList, RunnableArgs<List<PickingObjectDTO>> onComplete) {
         List<String> codMarts = sitArtOrdList.stream()
@@ -1653,7 +1673,7 @@ public class SpedizioneViewModel {
         }
     }
 
-    private void duplicateUDS(MtbColt savedMtbColt, Integer inputNumber, RunnableArgs<List<MtbColt>> onComplete){
+    private void duplicateUDS(MtbColt savedMtbColt, Integer inputNumber, RunnableArgs<List<MtbColt>> onComplete) {
         var duplicateUDSRequestDTO = new DuplicateUDSRequestDTO()
                 .setMtbColt(savedMtbColt)
                 .setNumOfDuplicates(inputNumber);
@@ -1982,6 +2002,10 @@ public class SpedizioneViewModel {
         return mPickingList;
     }
 
+    public List<MtbPartitaMag> getmPartitaMagList() {
+        return mPartitaMagList;
+    }
+
     public ArrayList<MtbColt> getCreatedMtbColts() {
         return (ArrayList<MtbColt>) this.mColliRegistrati;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java
index bc2df22e..84547c37 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java
@@ -2,9 +2,11 @@ package it.integry.integrywmsnative.view.dialogs.input_quantity_v2;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.List;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgsWithReturn;
 import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 
@@ -57,6 +59,8 @@ public class DialogInputQuantityV2DTO {
 
     private String customArtDescription;
 
+    private List<MtbPartitaMag> mtbPartitaMagList;
+
     public MtbAart getMtbAart() {
         return mtbAart;
     }
@@ -380,4 +384,13 @@ public class DialogInputQuantityV2DTO {
         this.warnOnQuantityOverflow = warnOnQuantityOverflow;
         return this;
     }
+
+    public List<MtbPartitaMag> getMtbPartitaMagList() {
+        return mtbPartitaMagList;
+    }
+
+    public DialogInputQuantityV2DTO setMtbPartitaMagList(List<MtbPartitaMag> mtbPartitaMagList) {
+        this.mtbPartitaMagList = mtbPartitaMagList;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
index 0aa33da3..ba92bce0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
@@ -27,6 +27,7 @@ import com.pedromassango.doubleclick.DoubleClickListener;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
+import java.util.Objects;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -177,6 +178,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                 .setSuggestPartitaMagRunnable(mDialogInputQuantityV2DTO.getSuggestPartitaMag())
                 .setDataScad(mDialogInputQuantityV2DTO.getDataScad())
                 .setDisableTracciabilitaCheck(mDialogInputQuantityV2DTO.isDisableTracciabilitaCheck())
+                .setmPartitaMagList(mDialogInputQuantityV2DTO.getMtbPartitaMagList())
                 .setStatoArt(mDialogInputQuantityV2DTO.getStatoPartitaMag() != null ? mDialogInputQuantityV2DTO.getStatoPartitaMag().getStatoArt() : null);
 
         mBindings.setView(this);
@@ -301,7 +303,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
 
         UtilityObservable.addPropertyChanged(this.currentPartitaMag, (value) -> {
             if (this.mEnableDataCallback) {
-                this.mViewModel.setPartitaMag(value);
+                this.mViewModel.setNewPartitaMag(value);
             }
         });
 
@@ -403,7 +405,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         UtilityObservable.addPropertyChanged(this.mViewModel.blockedQtaTot, (value) -> {
             toggleTextInputLayoutError(textColorsQtaTot, this.mBindings.inputQtaTotLayout, value);
 
-            if (this.mViewModel.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
+            if (Objects.requireNonNull(this.mViewModel.mtbAart.get()).isFlagQtaCnfFissaBoolean()) {
                 this.enabledNumCnf.set(this.mDialogInputQuantityV2DTO.isNumCnfEditable() && !value);
             } else {
                 if (value) {
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 6b7af810..dc2f3a77 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
@@ -4,8 +4,13 @@ import androidx.databinding.ObservableField;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
@@ -100,6 +105,8 @@ public class DialogInputQuantityV2ViewModel {
 
     private StatoPartitaMag statoArt;
 
+    private List<MtbPartitaMag> mPartitaMagList;
+
     @Inject
     public DialogInputQuantityV2ViewModel(BarcodeRESTConsumer barcodeRESTConsumer, MagazzinoRESTConsumer magazzinoRESTConsumer) {
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
@@ -354,6 +361,11 @@ public class DialogInputQuantityV2ViewModel {
         return this;
     }
 
+    public DialogInputQuantityV2ViewModel setmPartitaMagList(List<MtbPartitaMag> mPartitaMagList) {
+        this.mPartitaMagList = mPartitaMagList;
+        return this;
+    }
+
     public DialogInputQuantityV2ViewModel setWarnOnQuantityOverflow(boolean warnOnQuantityOverflow) {
         this.warnOnQuantityOverflow = warnOnQuantityOverflow;
         return this;
@@ -378,6 +390,37 @@ public class DialogInputQuantityV2ViewModel {
         return this;
     }
 
+    public void setNewPartitaMag(String internalPartitaMag) {
+        this.internalPartitaMag = internalPartitaMag;
+
+        if (mPartitaMagList != null && SettingsManager.iDB().isSuggestDataScad()){
+            Optional<MtbPartitaMag> partitaMag = mPartitaMagList.stream()
+                    .filter(x -> x.getPartitaMag().equalsIgnoreCase(internalPartitaMag))
+                    .findFirst();
+
+            if (partitaMag.isPresent()){
+                setNewDataScad(partitaMag.get().getDataScad());
+            } else {
+                MtbAart localMtbAart = mtbAart.get();
+                LocalDate dataScad = null;
+
+                if (localMtbAart != null && localMtbAart.getGgScadPartita() != null && localMtbAart.getGgScadPartita() > 0) {
+                    dataScad = UtilityDate.getNow();
+                    dataScad.plusDays(localMtbAart.getGgScadPartita());
+                }
+
+                setNewDataScad(dataScad);
+            }
+        }
+
+        this.mListener.onDataChanged();
+    }
+
+    public void setNewDataScad(LocalDate internalDataScad) {
+        this.internalDataScad = internalDataScad;
+        this.mListener.onDataChanged();
+    }
+
     public DialogInputQuantityV2ViewModel setDataScad(LocalDate internalDataScad) {
         this.internalDataScad = internalDataScad;
         return this;

From c6975badceaa0b3f96b3be6d4da13272517e2cb6 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Mon, 22 Jul 2024 09:09:27 +0200
Subject: [PATCH 025/103] -> v1.40.28 (445)

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

diff --git a/app/build.gradle b/app/build.gradle
index 5f786a03..1f758b62 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 444
-    def appVersionName = '1.40.27'
+    def appVersionCode = 445
+    def appVersionName = '1.40.28'
 
     signingConfigs {
         release {

From 64e38ce05a114a165b70c5cf16897efb13d79bc1 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 26 Jul 2024 16:28:16 +0200
Subject: [PATCH 026/103] Aggiunto log eccezione in fase di ExportLog

---
 .../integrywmsnative/gest/settings/MainSettingsFragment.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
index 1e622974..1498835d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
@@ -18,6 +18,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.sqlite.db.SimpleSQLiteQuery;
 
 import com.annimon.stream.Stream;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.harrysoft.androidbluetoothserial.BluetoothManager;
 
 import java.io.BufferedReader;
@@ -294,6 +295,8 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
                                         .makeErrorDialog(new SpannableString(Html.fromHtml(ex.getMessage())), null, null)
                                         .show(requireActivity().getSupportFragmentManager(), "tag");
                             });
+
+                            FirebaseCrashlytics.getInstance().recordException(ex);
                         }
                     });
                 })

From 5a147fb0de9a5c588079b5be2c9d6b53e1c1bb4e Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 26 Jul 2024 16:55:57 +0200
Subject: [PATCH 027/103] Mini-improvement

---
 .../gest/settings/MainSettingsFragment.java              | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
index 1498835d..03c4044b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
@@ -27,7 +27,9 @@ import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 
@@ -237,9 +239,10 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
                         File logFilePath = appContext.getLogFilePath();
                         var files = logFilePath.listFiles();
 
-                        var fileToShare = Stream.of(files)
-                                .sortBy(x -> -1 * x.lastModified())
-                                .findFirstOrElse(null);
+                        var fileToShare = Arrays.stream(files)
+                                .sorted(Comparator.reverseOrder())
+                                .findFirst()
+                                .orElse(null);
                         try {
                             List<MailAttachmentDTO> attachmentDTOList = new ArrayList<>();
 

From f65e69b745934738246c21c5dbcae2b0c07f2516 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 26 Jul 2024 16:58:10 +0200
Subject: [PATCH 028/103] -> v1.40.29 (446)

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

diff --git a/app/build.gradle b/app/build.gradle
index 1f758b62..680b4b17 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 445
-    def appVersionName = '1.40.28'
+    def appVersionCode = 446
+    def appVersionName = '1.40.29'
 
     signingConfigs {
         release {

From 44b9bc3fc1ff93501de31499091669966595a706 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 3 Sep 2024 10:19:07 +0200
Subject: [PATCH 029/103] Migliorato documento di reso quando effettuano le
 perdite

---
 .../rest/consumers/DocumentRESTConsumer.java  |  4 +-
 .../DocumentiRESTConsumerService.java         |  5 +-
 .../core/settings/DBSettingsModel.java        | 12 ++++-
 .../core/settings/SettingsManager.java        |  6 +++
 .../DocInterniViewModel.java                  | 51 ++++++++++---------
 .../dialog/DialogSelectDocInfoViewModel.java  |  7 ++-
 6 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java
index fc6643db..10ebd3ea 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java
@@ -51,9 +51,9 @@ public class DocumentRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void checkFrumaDocument(String fornitore, String numDoc, String dataDoc, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
+    public void checkDocument(String fornitore, String numDoc, String dataDoc, String tipoDoc, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
         var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
-        inventarioRESTConsumerService.checkFrumaDoc(fornitore, numDoc, dataDoc)
+        inventarioRESTConsumerService.checkDocument(fornitore, numDoc,tipoDoc, dataDoc)
                 .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(@NonNull Call<ServiceRESTResponse<Boolean>> call, @NonNull Response<ServiceRESTResponse<Boolean>> response) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java
index bfd9d899..615efda1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java
@@ -21,10 +21,11 @@ public interface DocumentiRESTConsumerService {
     @POST("createDocFromColli")
     Call<ServiceRESTResponse<DtbDoct>> createDocFromColli(@Body LoadColliDTO listColli);
 
-    @GET("wms/documento/checkFruma")
-    Call<ServiceRESTResponse<Boolean>> checkFrumaDoc(
+    @GET("wms/documento/checkDoc")
+    Call<ServiceRESTResponse<Boolean>> checkDocument(
             @Query("fornitore") String fornitore,
             @Query("numDoc") String numDoc,
+            @Query("tipoDoc") String tipoDoc,
             @Query("dataDoc") String dataDoc);
 
     @GET("wms/documento/arts")
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index 5f2448bb..aaec3140 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -76,13 +76,12 @@ public class DBSettingsModel {
     private boolean flagProduzioneShowInfo = false;
     private boolean flagAccettazioneBollaUseQtaOrd = true;
     private boolean flagWarningNewPartitaMag = false;
-
     private boolean flagTracciamentoImballiCaricoEnabled = false;
     private boolean flagTracciamentoImballiScaricoEnabled = false;
     private boolean flagPickingLiberoEnableScanArt = false;
     private boolean flagAskDuplicateUDSSpedizione = false;
-
     private boolean suggestDataScad = false;
+    private String docInterniRequestNumDoc;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -695,4 +694,13 @@ public class DBSettingsModel {
         this.suggestDataScad = suggestDataScad;
         return this;
     }
+
+    public String getDocInterniRequestNumDoc() {
+        return docInterniRequestNumDoc;
+    }
+
+    public DBSettingsModel setDocInterniRequestNumDoc(String docInterniRequestNumDoc) {
+        this.docInterniRequestNumDoc = docInterniRequestNumDoc;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index 7a85f68a..af8b9d70 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -557,6 +557,12 @@ public class SettingsManager {
                     dbSettingsModelIstance.setFlagTracciamentoImballiScaricoEnabled(!UtilityString.isNullOrEmpty(data));
                 }));
 
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
+                .setGestName("PVM")
+                .setSection("DOC_INTERNI")
+                .setKeySection("REQUEST_NUM_DOC")
+                .setSetter(dbSettingsModelIstance::setDocInterniRequestNumDoc));
+
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
index ffcda8a5..f050a63c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
@@ -105,31 +105,34 @@ public class DocInterniViewModel {
         this.numDoc = selection.getNumDoc() != null ? selection.getNumDoc().toString() : null;
         this.note = selection.getNote();
 
-        if (dtbTipi.getCodDtip().equalsIgnoreCase("FRUMA")) {
-            documentRESTConsumer.checkFrumaDocument(
-                    fornitore.getCodAnag(),
-                    numDoc,
-                    UtilityDate.formatDate(dataDoc, "yyyy/MM/dd"),
-                    data -> {
-                        if (!data) {
-                            this.sendWarning(UtilityResources.getString(R.string.no_doc_found_message), this::init);
-                        } else {
-                            action.run();
-                            this.sendOnLoadingStarted();
-                            fetchProducts(() -> {
-                                fetchDocuments(this::sendOnLoadingEnded);
-                            });
-                        }
-                    },
-                    this::sendError
-            );
-        } else {
-            action.run();
-            this.sendOnLoadingStarted();
-            fetchProducts(() -> {
-                fetchDocuments(this::sendOnLoadingEnded);
-            });
+        String codAnag = null;
+        if (fornitore != null){
+            codAnag = fornitore.getCodAnag();
         }
+
+        String codDtip = null;
+        if (dtbTipi != null){
+            codDtip = dtbTipi.getCodDtip();
+        }
+
+        documentRESTConsumer.checkDocument(
+                codAnag,
+                numDoc,
+                UtilityDate.formatDate(dataDoc, "yyyy/MM/dd"),
+                codDtip,
+                data -> {
+                    if (!data) {
+                        this.sendWarning(UtilityResources.getString(R.string.no_doc_found_message), this::init);
+                    } else {
+                        action.run();
+                        this.sendOnLoadingStarted();
+                        fetchProducts(() -> {
+                            fetchDocuments(this::sendOnLoadingEnded);
+                        });
+                    }
+                },
+                this::sendError
+        );
     }
 
     public void fetchProducts(Runnable onComplete) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java
index 3edb1a81..ec74bfa4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java
@@ -3,10 +3,13 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dialog;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.exception.DocumentRequiredException;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.exception.FornitoreRequiredException;
@@ -33,9 +36,11 @@ public class DialogSelectDocInfoViewModel extends ViewModel {
     private final MutableLiveData<Boolean> noteRequired = new MutableLiveData<>(false);
 
     public DialogSelectDocInfoViewModel() {
+        List<String> requestNumDocList = Arrays.asList(SettingsManager.iDB().getDocInterniRequestNumDoc().split("\\|"));
+
         tipoDoc.observeForever(val -> fornitoreRequired.postValue(val != null && (val.getGestioneDoc().equals("T") || val.getGestioneDoc().equals("A") || (val.getGestioneDoc().equals("P") && !val.getGestione().equals("L")))));
 
-        tipoDoc.observeForever(val -> documentRequired.postValue(val != null && val.getGestioneDoc().equalsIgnoreCase("P") && !val.getGestione().equalsIgnoreCase("L")));
+        tipoDoc.observeForever(val -> documentRequired.postValue(val != null && (val.getGestioneDoc().equalsIgnoreCase("P") && !val.getGestione().equalsIgnoreCase("L")) || requestNumDocList.contains(Objects.requireNonNull(val).getCodDtip())));
 
         tipoDoc.observeForever(val -> noteRequired.postValue(val != null && val.getGestioneDoc().equals("P") && val.getGestione().equals("L")));
     }

From d897c83165beadc542b5697a892d5f313ab93a10 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Wed, 4 Sep 2024 12:56:24 +0200
Subject: [PATCH 030/103] Cambiato messaggio di warning per check documenti
 interni

---
 .../gest/contab_doc_interni/DocInterniViewModel.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
index f050a63c..075a84af 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
@@ -122,7 +122,7 @@ public class DocInterniViewModel {
                 codDtip,
                 data -> {
                     if (!data) {
-                        this.sendWarning(UtilityResources.getString(R.string.no_doc_found_message), this::init);
+                        this.sendWarning("Documento di riferimento non trovato!", this::init);
                     } else {
                         action.run();
                         this.sendOnLoadingStarted();

From 7b1f58412ab1147188a666f627ae84172238f3ff Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Fri, 13 Sep 2024 09:42:38 +0200
Subject: [PATCH 031/103] -> v1.40.30 (447)

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

diff --git a/app/build.gradle b/app/build.gradle
index 680b4b17..898a04a4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 446
-    def appVersionName = '1.40.29'
+    def appVersionCode = 447
+    def appVersionName = '1.40.30'
 
     signingConfigs {
         release {

From 7ee59ea81498b3cf697ad91fd9fd7445f72fe298 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 16 Sep 2024 10:33:59 +0200
Subject: [PATCH 032/103] Implementata richiesta commessa in PickingLibero di
 Lavorazione. Implementato servizio di spostamento arts tra UL in
 PickingLibero. Implementata generazione documenti in CloseUDS in
 PickingLibero.

---
 .idea/deploymentTargetSelector.xml            |   8 +
 app/build.gradle                              |  14 +-
 .../MainApplicationComponent.java             |   7 +-
 .../configs/MenuConfiguration.java            |   8 +-
 .../integrywmsnative/core/model/JtbComt.java  |  10 +
 .../consumers/ColliMagazzinoRESTConsumer.java |  58 +--
 .../ColliMagazzinoRESTConsumerService.java    |   3 +-
 .../rest/model/CriterioDistribuzioneEnum.java |  42 ++
 .../rest/model/SpostaArtsTraULRequestDTO.java |  10 +
 .../model/SpostaArtsTraULResponseDTO.java     |  18 +
 .../rest/model/uds/CloseUDSRequestDTO.java    |  43 ++
 .../rest/model/uds/CloseUDSResponseDTO.java   |   6 +
 .../model/uds/InsertUDSRowRequestDTO.java     |  11 +
 .../core/settings/DBSettingsModel.java        |  50 +++
 .../core/settings/SettingsManager.java        |  29 ++
 .../AccettazioneBollaPickingViewModel.java    | 383 ++++--------------
 .../AccettazioneOrdiniPickingActivity.java    |   6 +-
 .../AccettazioneOrdiniPickingViewModel.java   |  81 ++--
 .../AccettazioneOrdiniPickingListAdapter.java |  12 +-
 .../picking_libero/PickingLiberoFragment.java |  15 +-
 .../PickingLiberoViewModel.java               | 116 +++---
 .../ProdRecuperoMaterialeFragment.java        |   1 +
 .../ProdRecuperMaterialeRESTConsumer.java     |  17 +-
 .../ui/HistoryULsListAdapter.java             |   8 +-
 .../ui/HistoryULsListModel.java               |  10 +
 .../ProdRientroMerceViewModel.java            |  12 +-
 .../ProdRientroMerceOrderDetailFragment.java  |  21 +-
 .../ProdRientroMerceOrderDetailViewModel.java |  53 ++-
 .../ImportColliDaProduzioneRequestDTO.java    |   7 +-
 .../ProdRiposizionamentoDaProdViewModel.java  |  13 +-
 .../gest/spedizione/SpedizioneActivity.java   |  11 +-
 .../gest/spedizione/SpedizioneViewModel.java  |  63 ++-
 .../spedizione/ui/SpedizioneListAdapter.java  |  19 +-
 .../VersamentoMerceViewModel.java             |   3 +-
 ...leAutoCompleteTwoLinesDropdownAdapter.java |  45 +-
 ...AutoCompleteTwoLinesDropdownListModel.java |   5 +
 ...AskCliente_Page1_Cliente_ArrayAdapter.java |   2 +-
 .../DialogAskCommessaComponent.java           |  14 +
 .../ask_commessa/DialogAskCommessaModule.java |  15 +
 .../ask_commessa/DialogAskCommessaView.java   | 168 ++++++++
 .../DialogAskCommessaViewModel.java           |  69 ++++
 .../DialogInputLUProdTipoColloAdapter.java    |  14 +-
 app/src/main/res/drawable/ic_puzzle.xml       |   9 +
 .../main/res/layout/dialog_ask_commessa.xml   | 100 +++++
 ...ropdown_simple_item_w_subtitle_bottom.xml} |   0
 ...agment_prod_rientro_merce_order_detail.xml |  33 +-
 .../prod_recupero_materiale_list_item.xml     | 101 +++--
 app/src/main/res/values/custom_colors.xml     |   4 +
 barcode_base_android_library/build.gradle     |   2 +-
 build.gradle                                  |   8 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 honeywellscannerlibrary/build.gradle          |   2 +-
 keyobardemulatorscannerlibrary/build.gradle   |   2 +-
 pointmobilescannerlibrary/build.gradle        |   2 +-
 zebrascannerlibrary/build.gradle              |   2 +-
 55 files changed, 1166 insertions(+), 601 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/CriterioDistribuzioneEnum.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/SpostaArtsTraULResponseDTO.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaComponent.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaModule.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaView.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaViewModel.java
 create mode 100644 app/src/main/res/drawable/ic_puzzle.xml
 create mode 100644 app/src/main/res/layout/dialog_ask_commessa.xml
 rename app/src/main/res/layout/{dropdown_simple_item_w_subtitle.xml => dropdown_simple_item_w_subtitle_bottom.xml} (100%)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b268ef36..f23a4811 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-09-13T09:26:42.884931500Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=R52T60AZ93A" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 898a04a4..1a514540 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -92,7 +92,7 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
@@ -103,16 +103,16 @@ dependencies {
     //Firebase
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:32.8.1')
+    implementation platform('com.google.firebase:firebase-bom:33.2.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:18.3.0'
+    implementation 'com.google.android.gms:play-services-basement:18.4.0'
 
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
@@ -127,12 +127,12 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.annimon:stream:1.2.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.5'
 //    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
-    def dagger2_version = '2.46.1'
+    def dagger2_version = '2.49'
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
index 40a6eb59..b7c4950a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
@@ -110,6 +110,8 @@ import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetM
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalModule;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteModule;
+import it.integry.integrywmsnative.view.dialogs.ask_commessa.DialogAskCommessaComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_commessa.DialogAskCommessaModule;
 import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaProdComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaProdModule;
 import it.integry.integrywmsnative.view.dialogs.ask_unknown_barcode_notes.DialogAskUnknownBarcodeNotesComponent;
@@ -215,7 +217,8 @@ import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracc
         DialogInfoGiacenzaModule.class,
         ArticoliInGiacenzaModule.class,
         DialogTracciamentoImballiModule.class,
-        DialogAskVettoreModule.class
+        DialogAskVettoreModule.class,
+        DialogAskCommessaModule.class
 })
 public interface MainApplicationComponent {
 
@@ -361,6 +364,8 @@ public interface MainApplicationComponent {
 
     DialogAskVettoreComponent.Factory dialogAskVettoreComponent();
 
+    DialogAskCommessaComponent.Factory dialogAskCommessaComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
index 64edbc2a..f5319e45 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
@@ -88,7 +88,8 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setTitleText(R.string.free_picking)
                                         .setTitleIcon(R.drawable.ic_dashboard_picking_libero)
                                         .setDrawerIcon(R.drawable.ic_black_barcode_scanner)
-                                        .setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.free_picking, GestioneEnum.VENDITA, SettingsManager.iDB().isFlagAskClienteInPickingLibero(), false)))
+                                        .setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.free_picking, GestioneEnum.VENDITA,
+                                                SettingsManager.iDB().isFlagAskClienteInPickingLibero(), false, false)))
 
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_resi_cliente)
@@ -124,7 +125,8 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                 .setTitleText(R.string.free_lav_picking)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_picking_libero)
                                 .setDrawerIcon(R.drawable.ic_black_barcode_scanner)
-                                .setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.free_lav_picking, GestioneEnum.LAVORAZIONE, SettingsManager.iDB().isFlagAskClienteInPickingLibero(), false)))
+                                .setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.free_lav_picking, GestioneEnum.LAVORAZIONE,
+                                        SettingsManager.iDB().isFlagAskClienteInPickingLibero(), false, SettingsManager.iDB().isFlagAskCommessaInPickingLiberoLav())))
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_prod_posizionamento_da_ord)
@@ -180,7 +182,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                 .setTitleText(R.string.prod_versamento_su_ordine_title_fragment)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_su_ord)
                                 .setDrawerIcon(R.drawable.ic_black_external)
-                                .setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.prod_versamento_su_ordine_title_fragment, GestioneEnum.LAVORAZIONE, false, true)))
+                                .setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.prod_versamento_su_ordine_title_fragment, GestioneEnum.LAVORAZIONE, false, true, false)))
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_prod_riposizionamento_da_ord)
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/JtbComt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/JtbComt.java
index 444ddfb4..b1b7dd54 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/JtbComt.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/JtbComt.java
@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.model;
 public class JtbComt extends EntityBase {
 
     private String codJcom;
+    private String codAnag;
     private String codJfas;
     private String codJflav;
     private String descrizione;
@@ -20,6 +21,15 @@ public class JtbComt extends EntityBase {
         return this;
     }
 
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public JtbComt setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+        return this;
+    }
+
     public String getCodJfas() {
         return codJfas;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
index 4249e1fc..05308af2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
@@ -31,6 +31,7 @@ import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CanULBeDeletedRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
@@ -497,38 +498,37 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void spostaArtsTraUL(MtbColt sourceMtbColt, MtbColt destMtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        new Thread(() -> {
-            MtbColt mtbColtToMoveClone = (MtbColt) sourceMtbColt.clone();
-            MtbColt mtbColtDestClone = (MtbColt) destMtbColt.clone();
+    public void spostaArtsTraUL(MtbColt sourceMtbColt, MtbColt destMtbColt, boolean flagForceUseRefs, RunnableArgs<List<MtbColr>> onComplete, RunnableArgs<Exception> onFailed) {
+        MtbColt mtbColtToMoveClone = (MtbColt) sourceMtbColt.clone();
+        MtbColt mtbColtDestClone = (MtbColt) destMtbColt.clone();
 
-            for (int i = 0; i < mtbColtToMoveClone.getMtbColr().size(); i++) {
-                mtbColtToMoveClone.getMtbColr().get(i)
-                        .setMtbAart(null)
-                        .setMtbPartitaMag(null);
+        for (int i = 0; i < mtbColtToMoveClone.getMtbColr().size(); i++) {
+            mtbColtToMoveClone.getMtbColr().get(i)
+                    .setMtbAart(null)
+                    .setMtbPartitaMag(null);
+        }
+
+        mtbColtDestClone.setMtbColr(null);
+
+        SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO = new SpostaArtsTraULRequestDTO()
+                .setSourceMtbColt(mtbColtToMoveClone)
+                .setDestinationMtbColt(mtbColtDestClone)
+                .setFlagForceUseRefs(flagForceUseRefs);
+
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService.spostaArtsTraUL(spostaArtsTraULRequestDTO).enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> call, Response<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> response) {
+                analyzeAnswer(response, "spostaArtsTraUL", data -> {
+                    onComplete.run(data.getGeneratedMtbColr());
+                }, onFailed);
             }
 
-            mtbColtDestClone.setMtbColr(null);
-
-            SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO = new SpostaArtsTraULRequestDTO()
-                    .setSourceMtbColt(mtbColtToMoveClone)
-                    .setDestinationMtbColt(mtbColtDestClone);
-
-            ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-            colliMagazzinoRESTConsumerService.spostaArtsTraUL(spostaArtsTraULRequestDTO).enqueue(new Callback<>() {
-                @Override
-                public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
-                    analyzeAnswer(response, "spostaArtsTraUL", data -> {
-                        onComplete.run();
-                    }, onFailed);
-                }
-
-                @Override
-                public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
-                    if (onFailed != null) onFailed.run(new Exception(t));
-                }
-            });
-        }).start();
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> call, Throwable t) {
+                if (onFailed != null) onFailed.run(new Exception(t));
+            }
+        });
     }
 
     public void assegnaLottoSuColloScarico(MtbColt sourceMtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java
index 1e13a7d0..d8c1589d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java
@@ -7,6 +7,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CanULBeDeletedRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
@@ -35,7 +36,7 @@ public interface ColliMagazzinoRESTConsumerService {
     Call<ServiceRESTResponse<Object>> spostaULInPosizione(@Query("codMdep") String codMdep, @Query("posizione") String posizione, @Body MtbColt mtbColtToMove);
 
     @POST("wms/spostaArtsTraUL")
-    Call<ServiceRESTResponse<Object>> spostaArtsTraUL(@Body SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO);
+    Call<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> spostaArtsTraUL(@Body SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO);
 
     @POST("wms/assegnaLottoSuColloScarico")
     Call<ServiceRESTResponse<MtbColt>> assegnaLottoSuColloScarico(@Body MtbColt mtbColt);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/CriterioDistribuzioneEnum.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/CriterioDistribuzioneEnum.java
new file mode 100644
index 00000000..a65b3a67
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/CriterioDistribuzioneEnum.java
@@ -0,0 +1,42 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public enum CriterioDistribuzioneEnum {
+    @SerializedName("U")
+    U("U"),        //AGGIORNA IL COLLO ESISTENTE
+
+    @SerializedName("O")
+    O("O"),        //DIVIDE IL COLLO INIZIALE PER ORDINE
+
+    @SerializedName("G")
+    G("G"),        //DIVIDE IL COLLO INIZIALE PER  IL GRUPPO BOLLA DEGLI ARTICOLI
+
+    @SerializedName("UP")
+    UP("UP"),      //SI TRATTA DI UN COLLO DI LAVORAZIONE CHE HA SULLE RIGHE I RIFERIMENTI DELL'ORDINE DI PRODUZIONE (GESTIONE_RIF = 'A')
+    //E VIENE LANCIATA LA NORMALE DISTRIBUZIONE MA NELL'AGGIORNARE IL COLLO VENGONO LETTI I RIFERIMENTI DELL'ORDINE DI LAVORAZIOKNE
+    // A CUI LA CHIAVE DATA,NUMERO E RIGA ORDINE FANNO RIFERIMENTO
+
+
+    @SerializedName("FASE")
+    FASE("FASE");
+
+    private final String text;
+
+    CriterioDistribuzioneEnum(String text) {
+        this.text = text;
+    }
+
+
+    public String getText() {
+        return this.text;
+    }
+
+    public static CriterioDistribuzioneEnum fromString(String text) {
+        for (CriterioDistribuzioneEnum b : CriterioDistribuzioneEnum.values()) {
+            if (b.text.equalsIgnoreCase(text)) return b;
+        }
+        return null;
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SpostaArtsTraULRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SpostaArtsTraULRequestDTO.java
index bb1adb64..a658f79c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SpostaArtsTraULRequestDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SpostaArtsTraULRequestDTO.java
@@ -9,6 +9,8 @@ public class SpostaArtsTraULRequestDTO {
 
     private MtbColt destinationMtbColt;
 
+    private boolean flagForceUseRefs;
+
     public MtbColt getSourceMtbColt() {
         return sourceMtbColt;
     }
@@ -27,4 +29,12 @@ public class SpostaArtsTraULRequestDTO {
         return this;
     }
 
+    public boolean isFlagForceUseRefs() {
+        return flagForceUseRefs;
+    }
+
+    public SpostaArtsTraULRequestDTO setFlagForceUseRefs(boolean flagForceUseRefs) {
+        this.flagForceUseRefs = flagForceUseRefs;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SpostaArtsTraULResponseDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SpostaArtsTraULResponseDTO.java
new file mode 100644
index 00000000..457864bd
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SpostaArtsTraULResponseDTO.java
@@ -0,0 +1,18 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbColr;
+
+public class SpostaArtsTraULResponseDTO {
+    private List<MtbColr> generatedMtbColr;
+
+    public List<MtbColr> getGeneratedMtbColr() {
+        return generatedMtbColr;
+    }
+
+    public SpostaArtsTraULResponseDTO setGeneratedMtbColr(List<MtbColr> generatedMtbColr) {
+        this.generatedMtbColr = generatedMtbColr;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CloseUDSRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CloseUDSRequestDTO.java
index f53ca7ea..7277828c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CloseUDSRequestDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CloseUDSRequestDTO.java
@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.rest.model.uds;
 
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.model.CriterioDistribuzioneEnum;
 
 public class CloseUDSRequestDTO {
 
@@ -8,6 +9,20 @@ public class CloseUDSRequestDTO {
     private String orderCodMdep;
     private MtbColt mtbColt;
 
+    private boolean createDocument;
+    private String documentCodDtip;
+    private String documentCodAnag;
+
+    private CriterioDistribuzioneEnum criterioDistribuzione;
+
+    public boolean isCreateDocument() {
+        return createDocument;
+    }
+
+    public String getDocumentCodDtip() {
+        return documentCodDtip;
+    }
+
     public boolean isPrintSSCC() {
         return printSSCC;
     }
@@ -34,4 +49,32 @@ public class CloseUDSRequestDTO {
         this.mtbColt = mtbColt;
         return this;
     }
+
+    public CloseUDSRequestDTO setCreateDocument(boolean createDocument) {
+        this.createDocument = createDocument;
+        return this;
+    }
+
+    public CloseUDSRequestDTO setDocumentCodDtip(String documentCodDtip) {
+        this.documentCodDtip = documentCodDtip;
+        return this;
+    }
+
+    public String getDocumentCodAnag() {
+        return documentCodAnag;
+    }
+
+    public CloseUDSRequestDTO setDocumentCodAnag(String documentCodAnag) {
+        this.documentCodAnag = documentCodAnag;
+        return this;
+    }
+
+    public CriterioDistribuzioneEnum getCriterioDistribuzione() {
+        return criterioDistribuzione;
+    }
+
+    public CloseUDSRequestDTO setCriterioDistribuzione(CriterioDistribuzioneEnum criterioDistribuzione) {
+        this.criterioDistribuzione = criterioDistribuzione;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CloseUDSResponseDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CloseUDSResponseDTO.java
index d24f43f7..c925374e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CloseUDSResponseDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CloseUDSResponseDTO.java
@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.core.rest.model.uds;
 
 import java.util.List;
 
+import it.integry.integrywmsnative.core.model.DtbDoct;
 import it.integry.integrywmsnative.core.model.MtbColt;
 
 public class CloseUDSResponseDTO {
@@ -9,6 +10,7 @@ public class CloseUDSResponseDTO {
     private boolean deleted;
 
     private List<MtbColt> generatedMtbColts;
+    private DtbDoct generatedDocument;
 
     public boolean isSaved() {
         return saved;
@@ -21,4 +23,8 @@ public class CloseUDSResponseDTO {
     public List<MtbColt> getGeneratedMtbColts() {
         return generatedMtbColts;
     }
+
+    public DtbDoct getGeneratedDocument() {
+        return generatedDocument;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/InsertUDSRowRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/InsertUDSRowRequestDTO.java
index 4e704c4d..a239437c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/InsertUDSRowRequestDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/InsertUDSRowRequestDTO.java
@@ -18,6 +18,8 @@ public class InsertUDSRowRequestDTO {
     private String partitaMag;
     private LocalDate dataScad;
 
+    private String codJcom;
+
     public MtbColr getSourceMtbColr() {
         return sourceMtbColr;
     }
@@ -89,4 +91,13 @@ public class InsertUDSRowRequestDTO {
         this.dataScad = dataScad;
         return this;
     }
+
+    public String getCodJcom() {
+        return codJcom;
+    }
+
+    public InsertUDSRowRequestDTO setCodJcom(String codJcom) {
+        this.codJcom = codJcom;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index aaec3140..cadafa1c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -21,6 +21,7 @@ public class DBSettingsModel {
     private boolean flagMultiClienteOrdV;
     private boolean flagUseCodAnagAziendale;
     private boolean flagAskClienteInPickingLibero;
+    private boolean flagAskCommessaInPickingLiberoLav;
     private boolean flagPickLiberoAllowEmptyCliente;
 
     private boolean flagCanAddExtraItemSpedizione;
@@ -82,6 +83,10 @@ public class DBSettingsModel {
     private boolean flagAskDuplicateUDSSpedizione = false;
     private boolean suggestDataScad = false;
     private String docInterniRequestNumDoc;
+    private String produzioneCodDtipCar;
+    private boolean produzioneGeneraDocCar;
+    private String produzioneCodDtipScar;
+    private boolean produzioneGeneraDocScar;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -172,6 +177,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public boolean isFlagAskCommessaInPickingLiberoLav() {
+        return flagAskCommessaInPickingLiberoLav;
+    }
+
+    public DBSettingsModel setFlagAskCommessaInPickingLiberoLav(boolean flagAskCommessaInPickingLiberoLav) {
+        this.flagAskCommessaInPickingLiberoLav = flagAskCommessaInPickingLiberoLav;
+        return this;
+    }
+
     public boolean isFlagPickLiberoAllowEmptyCliente() {
         return flagPickLiberoAllowEmptyCliente;
     }
@@ -703,4 +717,40 @@ public class DBSettingsModel {
         this.docInterniRequestNumDoc = docInterniRequestNumDoc;
         return this;
     }
+
+    public String getProduzioneCodDtipCar() {
+        return produzioneCodDtipCar;
+    }
+
+    public DBSettingsModel setProduzioneCodDtipCar(String produzioneCodDtipCar) {
+        this.produzioneCodDtipCar = produzioneCodDtipCar;
+        return this;
+    }
+
+    public boolean isProduzioneGeneraDocCar() {
+        return produzioneGeneraDocCar;
+    }
+
+    public DBSettingsModel setProduzioneGeneraDocCar(boolean produzioneGeneraDocCar) {
+        this.produzioneGeneraDocCar = produzioneGeneraDocCar;
+        return this;
+    }
+
+    public String getProduzioneCodDtipScar() {
+        return produzioneCodDtipScar;
+    }
+
+    public DBSettingsModel setProduzioneCodDtipScar(String produzioneCodDtipScar) {
+        this.produzioneCodDtipScar = produzioneCodDtipScar;
+        return this;
+    }
+
+    public boolean isProduzioneGeneraDocScar() {
+        return produzioneGeneraDocScar;
+    }
+
+    public DBSettingsModel setProduzioneGeneraDocScar(boolean produzioneGeneraDocScar) {
+        this.produzioneGeneraDocScar = produzioneGeneraDocScar;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index af8b9d70..c390e572 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -228,6 +228,11 @@ public class SettingsManager {
                 .setSection("PICKING_LIBERO")
                 .setKeySection("FLAG_ASK_CLIENTE")
                 .setSetter(dbSettingsModelIstance::setFlagAskClienteInPickingLibero));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("PICKING_LIBERO")
+                .setKeySection("FLAG_ASK_COMMESSA_LAV")
+                .setSetter(dbSettingsModelIstance::setFlagAskCommessaInPickingLiberoLav));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("PICKING_LIBERO")
@@ -563,6 +568,30 @@ public class SettingsManager {
                 .setKeySection("REQUEST_NUM_DOC")
                 .setSetter(dbSettingsModelIstance::setDocInterniRequestNumDoc));
 
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
+                .setGestName("W_PORDI_RC")
+                .setSection("SETUP_DOCUMENTI")
+                .setKeySection("COD_DTIP_CAR")
+                .setSetter(dbSettingsModelIstance::setProduzioneCodDtipCar));
+
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("PRODUZIONE")
+                .setKeySection("FLAG_GENERA_DOC_CAR")
+                .setSetter(dbSettingsModelIstance::setProduzioneGeneraDocCar));
+
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
+                .setGestName("W_PORDI_RC")
+                .setSection("SETUP_DOCUMENTI")
+                .setKeySection("COD_DTIP_SCAR")
+                .setSetter(dbSettingsModelIstance::setProduzioneCodDtipScar));
+
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("PRODUZIONE")
+                .setKeySection("FLAG_GENERA_DOC_SCAR")
+                .setSetter(dbSettingsModelIstance::setProduzioneGeneraDocScar));
+
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
index 6e8b80eb..8acd56d4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
@@ -92,13 +92,7 @@ public class AccettazioneBollaPickingViewModel {
     private final List<HistoryMtbAartDTO> mHistoryUsedAarts = new ArrayList<>();
 
     @Inject
-    public AccettazioneBollaPickingViewModel(ArticoloRESTConsumer articoloRESTConsumer,
-                                             BarcodeRESTConsumer barcodeRESTConsumer,
-                                             ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
-                                             PrinterRESTConsumer printerRESTConsumer,
-                                             AccettazioneBollaPickingRESTConsumer accettazioneBollaPickingRESTConsumer,
-                                             ColliAccettazioneRESTConsumer colliAccettazioneRESTConsumer,
-                                             ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer) {
+    public AccettazioneBollaPickingViewModel(ArticoloRESTConsumer articoloRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer, AccettazioneBollaPickingRESTConsumer accettazioneBollaPickingRESTConsumer, ColliAccettazioneRESTConsumer colliAccettazioneRESTConsumer, ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer) {
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
@@ -112,20 +106,14 @@ public class AccettazioneBollaPickingViewModel {
         this.mBolle = bolle;
         this.mUseQtaBolla = useQtaOrd;
 
-        List<SitBollaAccettazioneDTO> mSitArts = Stream.of(sitArts)
-                .filter(x ->
-                        UtilityBigDecimal.greaterThan(x.getQtaDaAccettare(), BigDecimal.ZERO))
-                .toList();
+        List<SitBollaAccettazioneDTO> mSitArts = Stream.of(sitArts).filter(x -> UtilityBigDecimal.greaterThan(x.getQtaDaAccettare(), BigDecimal.ZERO)).toList();
 
         getEmptyPickingList(mSitArts, this.mPickingList::postValue);
 
 
         defaultGestioneOfUL = GestioneEnum.ACQUISTO;
 
-        var availableCodAnags = bolle.stream()
-                .map(TestataBollaAccettazioneDTO::getCodAnag)
-                .distinct()
-                .collect(Collectors.toList());
+        var availableCodAnags = bolle.stream().map(TestataBollaAccettazioneDTO::getCodAnag).distinct().collect(Collectors.toList());
         defaultCodAnag = availableCodAnags.size() == 1 ? availableCodAnags.get(0) : null;
 
         switch (defaultGestioneOfUL) {
@@ -136,27 +124,21 @@ public class AccettazioneBollaPickingViewModel {
 
     private void getEmptyPickingList(List<SitBollaAccettazioneDTO> sitBolleList, RunnableArgs<List<PickingObjectDTO>> onComplete) {
 
-        List<String> codMarts = Stream.of(sitBolleList)
-                .map(SitBollaAccettazioneDTO::getCodMart)
-                .toList();
+        List<String> codMarts = Stream.of(sitBolleList).map(SitBollaAccettazioneDTO::getCodMart).toList();
 
         this.mArticoloRESTConsumer.getByCodMarts(codMarts, listMtbAarts -> {
-            List<PickingObjectDTO> pickingList = Stream.of(sitBolleList)
-                    .map(sitBolla -> {
-                        MtbAart mtbAart = null;
+            List<PickingObjectDTO> pickingList = Stream.of(sitBolleList).map(sitBolla -> {
+                MtbAart mtbAart = null;
 
-                        for (MtbAart mtbAartItem : listMtbAarts) {
-                            if (mtbAartItem.getCodMart().equalsIgnoreCase(sitBolla.getCodMart())) {
-                                mtbAart = mtbAartItem;
-                                break;
-                            }
-                        }
+                for (MtbAart mtbAartItem : listMtbAarts) {
+                    if (mtbAartItem.getCodMart().equalsIgnoreCase(sitBolla.getCodMart())) {
+                        mtbAart = mtbAartItem;
+                        break;
+                    }
+                }
 
-                        return new PickingObjectDTO()
-                                .setSitBollaAccettazione(sitBolla)
-                                .setMtbAart(mtbAart);
-                    })
-                    .toList();
+                return new PickingObjectDTO().setSitBollaAccettazione(sitBolla).setMtbAart(mtbAart);
+            }).toList();
 
             onComplete.run(pickingList);
         }, this::sendError);
@@ -219,9 +201,7 @@ public class AccettazioneBollaPickingViewModel {
 
                     try {
                         numCollo = UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue());
-                        this.createNewLU(
-                                numCollo,
-                                CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, true, onComplete);
+                        this.createNewLU(numCollo, CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, true, onComplete);
                     } catch (Exception ex) {
                         this.sendError(ex);
                     }
@@ -234,11 +214,7 @@ public class AccettazioneBollaPickingViewModel {
     }
 
     private void processBarcodeNotOpenedLU(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
-        this.createNewLU(
-                null,
-                null,
-                false,
-                () -> processBarcodeAlreadyOpenedLU(barcodeScanDTO, onComplete));
+        this.createNewLU(null, null, false, () -> processBarcodeAlreadyOpenedLU(barcodeScanDTO, onComplete));
     }
 
     private void processBarcodeAlreadyOpenedLU(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
@@ -301,9 +277,7 @@ public class AccettazioneBollaPickingViewModel {
 
     private void executeEtichettaPosizione(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
 
-        var optionalPos = Stream.of(SettingsManager.iDB().getAvailablePosizioni())
-                .filter(x -> x.getPosizione().equalsIgnoreCase(barcodeScanDTO.getStringValue()))
-                .findFirst();
+        var optionalPos = Stream.of(SettingsManager.iDB().getAvailablePosizioni()).filter(x -> x.getPosizione().equalsIgnoreCase(barcodeScanDTO.getStringValue())).findFirst();
 
         this.sendFilterPosizioneApplied(optionalPos.get().getPosizione());
         onComplete.run();
@@ -325,9 +299,7 @@ public class AccettazioneBollaPickingViewModel {
     private void searchArtFromAnag(MtbAart mtbAart, PickDataDTO pickData, Runnable onComplete) {
         final List<PickingObjectDTO> pickingList = mPickingList.getValue();
 
-        List<PickingObjectDTO> matchPickingObject = Stream.of(pickingList)
-                .filter(x -> UtilityString.equalsIgnoreCase(mtbAart.getCodMart(), x.getSitBollaAccettazione().getCodMart()))
-                .toList();
+        List<PickingObjectDTO> matchPickingObject = Stream.of(pickingList).filter(x -> UtilityString.equalsIgnoreCase(mtbAart.getCodMart(), x.getSitBollaAccettazione().getCodMart())).toList();
 
         for (PickingObjectDTO pickingObjectDTO : matchPickingObject) {
             pickingObjectDTO.setTempPickData(pickData);
@@ -344,11 +316,7 @@ public class AccettazioneBollaPickingViewModel {
             this.manageDispatchBollaRow(matchedRows.get(0));
         } else {
             //So che il codMart sarà solo 1
-            var firstCodMart = Stream.of(matchedRows)
-                    .map(x -> x.getSitBollaAccettazione().getCodMart())
-                    .distinct()
-                    .findFirst()
-                    .get();
+            var firstCodMart = Stream.of(matchedRows).map(x -> x.getSitBollaAccettazione().getCodMart()).distinct().findFirst().get();
 
             this.sendFilterCodMartApplied(firstCodMart);
         }
@@ -359,14 +327,7 @@ public class AccettazioneBollaPickingViewModel {
         if (SettingsManager.iDB().isFlagAccettazioneBollaCanAddUnknownBarcodes()) {
             //TODO: Implementare popup che richiede delle note aggiuntive sul barcode scansionato
             this.sendOnUnknownBarcodeScanned(barcode, notes -> {
-                this.manageDispatchBollaRow(new PickingObjectDTO()
-                        .setMtbAart(new MtbAart()
-                                .setDescrizione(notes)
-                                .setDescrizioneEstesa(notes)
-                                .setFlagTracciabilita("N")
-                                .setFlagQtaCnfFissa("S")
-                                .setQtaCnf(BigDecimal.ONE)
-                                .setBarCode(barcode)));
+                this.manageDispatchBollaRow(new PickingObjectDTO().setMtbAart(new MtbAart().setDescrizione(notes).setDescrizioneEstesa(notes).setFlagTracciabilita("N").setFlagQtaCnfFissa("S").setQtaCnf(BigDecimal.ONE).setBarCode(barcode)));
                 onComplete.run();
             }, onComplete);
         } else {
@@ -378,29 +339,19 @@ public class AccettazioneBollaPickingViewModel {
     private void manageNoArtFound(MtbAart mtbAart, PickDataDTO pickDataDTO) {
         if (SettingsManager.iDB().isFlagAccettazioneBollaCanAddUnknownItems()) {
 
-            this.manageDispatchBollaRow(new PickingObjectDTO()
-                    .setMtbAart(mtbAart)
-                    .setTempPickData(pickDataDTO));
-        } else
-            this.sendError(new NoArtsFoundException());
+            this.manageDispatchBollaRow(new PickingObjectDTO().setMtbAart(mtbAart).setTempPickData(pickDataDTO));
+        } else this.sendError(new NoArtsFoundException());
     }
 
     public void createNewLU(Integer customNumCollo, String customSerCollo, boolean disablePrint, Runnable onComplete) {
         this.manageInfoAggiuntiveRequest((additionalNotes, tCol) -> {
 
-            final CreateUDCRequestDTO createUDCRequestDTO = new CreateUDCRequestDTO()
-                    .setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep())
-                    .setAnnotazioni(additionalNotes)
-                    .setCodTcol(tCol != null ? tCol.getCodTcol() : null)
-                    .setNumCollo(customNumCollo)
-                    .setSerCollo(customSerCollo)
-                    .setCodAnag(defaultCodAnag);
+            final CreateUDCRequestDTO createUDCRequestDTO = new CreateUDCRequestDTO().setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep()).setAnnotazioni(additionalNotes).setCodTcol(tCol != null ? tCol.getCodTcol() : null).setNumCollo(customNumCollo).setSerCollo(customSerCollo).setCodAnag(defaultCodAnag);
 
             this.mColliCaricoRESTConsumer.createUDC(createUDCRequestDTO, createdUDS -> {
                 this.mCurrentMtbColt = createdUDS;
 
-                this.mCurrentMtbColt.setMtbColr(new ObservableArrayList<>())
-                        .setDisablePrint(disablePrint);
+                this.mCurrentMtbColt.setMtbColr(new ObservableArrayList<>()).setDisablePrint(disablePrint);
 
                 if (onComplete != null) onComplete.run();
                 this.sendLUOpened(createdUDS);
@@ -429,13 +380,7 @@ public class AccettazioneBollaPickingViewModel {
         }
 
         if (SettingsManager.iDB().isFlagAccettazioneBollaEnableFastPick()) {
-            this.saveNewRow(pickingObjectDTO,
-                    BigDecimal.ONE,
-                    pickingObjectDTO.getMtbAart().getQtaCnf(),
-                    pickingObjectDTO.getMtbAart().getQtaCnf(),
-                    partitaMag,
-                    null,
-                    false);
+            this.saveNewRow(pickingObjectDTO, BigDecimal.ONE, pickingObjectDTO.getMtbAart().getQtaCnf(), pickingObjectDTO.getMtbAart().getQtaCnf(), partitaMag, null, false);
 
             return;
         }
@@ -443,21 +388,20 @@ public class AccettazioneBollaPickingViewModel {
         dispatchBollaRow(pickingObjectDTO);
     }
 
-    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO){
+    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO) {
         dispatchBollaRow(pickingObjectDTO, false);
     }
 
-    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO, boolean longClick) {
+    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO, boolean executeImmediately) {
         if (this.mCurrentMtbColt == null) return;
 
         AtomicBigDecimal numCnfWithdrawRows = new AtomicBigDecimal();
         AtomicBigDecimal qtaColWithdrawRows = new AtomicBigDecimal();
 
-        Stream.of(pickingObjectDTO.getWithdrawMtbColrs())
-                .forEach(row -> {
-                    numCnfWithdrawRows.addAndGet(row.getNumCnf());
-                    qtaColWithdrawRows.addAndGet(row.getQtaCol());
-                });
+        pickingObjectDTO.getWithdrawMtbColrs().forEach(row -> {
+            numCnfWithdrawRows.addAndGet(row.getNumCnf());
+            qtaColWithdrawRows.addAndGet(row.getQtaCol());
+        });
 
         BigDecimal totalQtaDoc = null;
         BigDecimal totalNumCnfDoc = null;
@@ -555,11 +499,10 @@ public class AccettazioneBollaPickingViewModel {
         }
 
         if (!this.mUseQtaBolla) {
-            if (UtilityBigDecimal.greaterThan(pickingObjectDTO.getMtbAart().getColliPedana(), BigDecimal.ZERO) &&
-                    UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
+            if (UtilityBigDecimal.greaterThan(pickingObjectDTO.getMtbAart().getColliPedana(), BigDecimal.ZERO) && UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
                 initialNumCnf = pickingObjectDTO.getMtbAart().getColliPedana();
                 initialQtaTot = initialNumCnf.multiply(initialQtaCnf);
-            } else if(UtilityBigDecimal.greaterThan(initialNumCnf, BigDecimal.ONE) && pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) {
+            } else if (UtilityBigDecimal.greaterThan(initialNumCnf, BigDecimal.ONE) && pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) {
                 initialNumCnf = BigDecimal.ONE;
                 initialQtaTot = initialNumCnf.multiply(initialQtaCnf);
             }
@@ -571,10 +514,7 @@ public class AccettazioneBollaPickingViewModel {
         }
 
         if (partitaMag == null && dataScad == null) {
-            HistoryMtbAartDTO historyMtbAartDTO =
-                    pickingObjectDTO.getMtbAart().getCodMart() != null ?
-                            this.getHistoryItemByCodMartIfExists(pickingObjectDTO.getMtbAart().getCodMart()) :
-                            this.getHistoryItemByBarcodeIfExists(pickingObjectDTO.getMtbAart().getBarCode());
+            HistoryMtbAartDTO historyMtbAartDTO = pickingObjectDTO.getMtbAart().getCodMart() != null ? this.getHistoryItemByCodMartIfExists(pickingObjectDTO.getMtbAart().getCodMart()) : this.getHistoryItemByBarcodeIfExists(pickingObjectDTO.getMtbAart().getBarCode());
 
             if (historyMtbAartDTO != null) {
                 partitaMag = historyMtbAartDTO.getPartitaMag();
@@ -582,48 +522,18 @@ public class AccettazioneBollaPickingViewModel {
             }
         }
 
-        if (!longClick){
-            this.sendOnItemDispatched(
-                    pickingObjectDTO,
-                    pickingObjectDTO.getMtbAart(),
-                    initialNumCnf, initialQtaCnf, initialQtaTot,
-                    qtaDaEvadere,
-                    numCnfDaEvadere,
-                    qtaCnfDaEvadere,
-                    qtaColDaPrelevare,
-                    numCnfDaPrelevare,
-                    qtaCnfDaPrelevare,
-                    null,
-                    null,
-                    null,
-                    partitaMag,
-                    dataScad,
-                    true,
-                    (pickedQuantityDTO, shouldCloseLU) -> {
-                        this.saveNewRow(pickingObjectDTO,
-                                pickedQuantityDTO.getNumCnf(),
-                                pickedQuantityDTO.getQtaCnf(),
-                                pickedQuantityDTO.getQtaTot(),
-                                pickedQuantityDTO.getPartitaMag(),
-                                pickedQuantityDTO.getDataScad(),
-                                shouldCloseLU);
-                    });
+        if (executeImmediately) {
+            this.saveNewRow(pickingObjectDTO, initialNumCnf, initialQtaCnf, initialQtaTot, partitaMag, dataScad, false);
         } else {
-            this.saveNewRow(
-                    pickingObjectDTO,
-                    initialNumCnf,
-                    initialQtaCnf,
-                    initialQtaTot,
-                    partitaMag,
-                    dataScad,
-                    false);
+            this.sendOnItemDispatched(pickingObjectDTO, pickingObjectDTO.getMtbAart(), initialNumCnf, initialQtaCnf, initialQtaTot, qtaDaEvadere, numCnfDaEvadere, qtaCnfDaEvadere, qtaColDaPrelevare, numCnfDaPrelevare, qtaCnfDaPrelevare, null, null, null, partitaMag, dataScad, true, (pickedQuantityDTO, shouldCloseLU) -> {
+                this.saveNewRow(pickingObjectDTO, pickedQuantityDTO.getNumCnf(), pickedQuantityDTO.getQtaCnf(), pickedQuantityDTO.getQtaTot(), pickedQuantityDTO.getPartitaMag(), pickedQuantityDTO.getDataScad(), shouldCloseLU);
+            });
         }
 
     }
 
 
-    public void saveNewRow(PickingObjectDTO pickingObjectDTO, BigDecimal numCnf, BigDecimal
-            qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
+    public void saveNewRow(PickingObjectDTO pickingObjectDTO, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
         if (UtilityBigDecimal.equalsTo(numCnf, BigDecimal.ZERO) && UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO)) {
             resetMatchedRows();
 
@@ -640,31 +550,16 @@ public class AccettazioneBollaPickingViewModel {
         var sitBolla = pickingObjectDTO.getSitBollaAccettazione();
         var firstAvailableBolla = mBolle.get(0);
 
-        var insertUDCRowRequestDto = new InsertUDCRowRequestDTO()
-                .setCodMart(pickingObjectDTO.getMtbAart().getCodMart())
-                .setDescrizione(pickingObjectDTO.getMtbAart().getCodMart() == null ? pickingObjectDTO.getMtbAart().getDescrizione() : null)
-                .setBarcode(pickingObjectDTO.getMtbAart().getBarCode())
-                .setQtaTot(qtaTot)
-                .setQtaCnf(qtaCnf)
-                .setNumCnf(numCnf)
-                .setPartitaMag(partitaMag)
+        var insertUDCRowRequestDto = new InsertUDCRowRequestDTO().setCodMart(pickingObjectDTO.getMtbAart().getCodMart()).setDescrizione(pickingObjectDTO.getMtbAart().getCodMart() == null ? pickingObjectDTO.getMtbAart().getDescrizione() : null).setBarcode(pickingObjectDTO.getMtbAart().getBarCode()).setQtaTot(qtaTot).setQtaCnf(qtaCnf).setNumCnf(numCnf).setPartitaMag(partitaMag)
 //                .setCodJcom(pickingObjectDTO.getSitBollaAccettazione().getCodJcom())
-                .setDataDoc(sitBolla != null ? sitBolla.getDataDoc() : firstAvailableBolla.getDataDoc())
-                .setNumDoc(sitBolla != null ? sitBolla.getNumDoc() : firstAvailableBolla.getNumDoc())
-                .setCodDtip(sitBolla != null ? sitBolla.getCodDtip() : firstAvailableBolla.getCodDtip())
-                .setSerDoc(sitBolla != null ? sitBolla.getSerDoc() : firstAvailableBolla.getSerDoc())
-                .setTargetMtbColt(clonedTargetMtbColt);
+                .setDataDoc(sitBolla != null ? sitBolla.getDataDoc() : firstAvailableBolla.getDataDoc()).setNumDoc(sitBolla != null ? sitBolla.getNumDoc() : firstAvailableBolla.getNumDoc()).setCodDtip(sitBolla != null ? sitBolla.getCodDtip() : firstAvailableBolla.getCodDtip()).setSerDoc(sitBolla != null ? sitBolla.getSerDoc() : firstAvailableBolla.getSerDoc()).setTargetMtbColt(clonedTargetMtbColt);
 
-        if (dataScad != null)
-            insertUDCRowRequestDto
-                    .setDataScad(dataScad);
+        if (dataScad != null) insertUDCRowRequestDto.setDataScad(dataScad);
 
         mColliCaricoRESTConsumer.insertUDCRow(insertUDCRowRequestDto, insertedMtbColr -> {
             this.addHistoryItem(insertedMtbColr);
 
-            insertedMtbColr
-                    .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
-                    .setMtbAart(pickingObjectDTO.getMtbAart());
+            insertedMtbColr.setUntMis(pickingObjectDTO.getMtbAart().getUntMis()).setMtbAart(pickingObjectDTO.getMtbAart());
 
             pickingObjectDTO.getWithdrawMtbColrs().add(insertedMtbColr);
             mCurrentMtbColt.getMtbColr().add(insertedMtbColr);
@@ -682,66 +577,32 @@ public class AccettazioneBollaPickingViewModel {
     }
 
     public void dispatchRowEdit(MtbColr mtbColrToEdit) {
-        final PickingObjectDTO pickingObjectDTO = new PickingObjectDTO()
-                .setMtbAart(mtbColrToEdit.getMtbAart());
+        final PickingObjectDTO pickingObjectDTO = new PickingObjectDTO().setMtbAart(mtbColrToEdit.getMtbAart());
 
-        this.sendOnItemDispatched(
-                pickingObjectDTO,
-                pickingObjectDTO.getMtbAart(),
-                mtbColrToEdit.getNumCnf(),
-                mtbColrToEdit.getQtaCnf(),
-                mtbColrToEdit.getQtaCol(),
-                null,
-                null,
-                null,
-                null, null, null,
-                null, null, null,
-                mtbColrToEdit.getPartitaMag(),
-                mtbColrToEdit.getDataScadPartita(),
-                true,
-                (pickedQuantityDTO, shouldCloseLU) -> {
+        this.sendOnItemDispatched(pickingObjectDTO, pickingObjectDTO.getMtbAart(), mtbColrToEdit.getNumCnf(), mtbColrToEdit.getQtaCnf(), mtbColrToEdit.getQtaCol(), null, null, null, null, null, null, null, null, null, mtbColrToEdit.getPartitaMag(), mtbColrToEdit.getDataScadPartita(), true, (pickedQuantityDTO, shouldCloseLU) -> {
 
-                    this.saveEditedRow(mtbColrToEdit,
-                            pickedQuantityDTO.getNumCnf(),
-                            pickedQuantityDTO.getQtaCnf(),
-                            pickedQuantityDTO.getQtaTot(),
-                            pickedQuantityDTO.getPartitaMag(),
-                            pickedQuantityDTO.getDataScad(),
-                            shouldCloseLU);
-                });
+            this.saveEditedRow(mtbColrToEdit, pickedQuantityDTO.getNumCnf(), pickedQuantityDTO.getQtaCnf(), pickedQuantityDTO.getQtaTot(), pickedQuantityDTO.getPartitaMag(), pickedQuantityDTO.getDataScad(), shouldCloseLU);
+        });
     }
 
-    private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal
-            qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
+    private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
         this.sendOnLoadingStarted();
 
         MtbColr mtbColrClone = (MtbColr) mtbColrToUpdate.clone();
-        mtbColrClone.setMtbAart(null)
-                .setMtbPartitaMag(null);
+        mtbColrClone.setMtbAart(null).setMtbPartitaMag(null);
 
-        var editUDCRowRequest = new EditUDCRowRequestDTO()
-                .setSourceMtbColr(mtbColrClone)
-                .setNewNumCnf(numCnf)
-                .setNewQtaCnf(qtaCnf)
-                .setNewQtaTot(qtaTot)
-                .setNewPartitaMag(partitaMag);
+        var editUDCRowRequest = new EditUDCRowRequestDTO().setSourceMtbColr(mtbColrClone).setNewNumCnf(numCnf).setNewQtaCnf(qtaCnf).setNewQtaTot(qtaTot).setNewPartitaMag(partitaMag);
 
-        if (dataScad != null)
-            editUDCRowRequest
-                    .setNewDataScad(dataScad);
+        if (dataScad != null) editUDCRowRequest.setNewDataScad(dataScad);
 
 
         this.mColliCaricoRESTConsumer.editUDCRow(editUDCRowRequest, (editedMtbColr) -> {
 
             this.addHistoryItem(editedMtbColr);
 
-            Optional<PickingObjectDTO> pickingObjectDTO = Stream.of(this.mPickingList.getValue())
-                    .filter(x -> Stream.of(x.getWithdrawMtbColrs()).anyMatch(y -> y == mtbColrToUpdate))
-                    .findSingle();
+            Optional<PickingObjectDTO> pickingObjectDTO = Stream.of(this.mPickingList.getValue()).filter(x -> Stream.of(x.getWithdrawMtbColrs()).anyMatch(y -> y == mtbColrToUpdate)).findSingle();
 
-            editedMtbColr
-                    .setUntMis(mtbColrToUpdate.getUntMis())
-                    .setMtbAart(mtbColrToUpdate.getMtbAart());
+            editedMtbColr.setUntMis(mtbColrToUpdate.getUntMis()).setMtbAart(mtbColrToUpdate.getMtbAart());
 
             if (pickingObjectDTO.isPresent()) {
                 pickingObjectDTO.get().getWithdrawMtbColrs().remove(mtbColrToUpdate);
@@ -764,30 +625,25 @@ public class AccettazioneBollaPickingViewModel {
     public void deleteRow(MtbColr mtbColrToDelete) {
         this.sendMtbColrDeleteRequest(shouldDelete -> {
 
-            if (!shouldDelete)
-                return;
+            if (!shouldDelete) return;
 
             this.sendOnLoadingStarted();
 
-            var deleteUDCRowRequest = new DeleteUDCRowRequestDTO()
-                    .setMtbColrToDelete(mtbColrToDelete);
+            var deleteUDCRowRequest = new DeleteUDCRowRequestDTO().setMtbColrToDelete(mtbColrToDelete);
 
-            this.mColliCaricoRESTConsumer.deleteUDCRow(deleteUDCRowRequest,
-                    () -> {
-                        Optional<PickingObjectDTO> pickingObjectDTO = Stream.of(this.mPickingList.getValue())
-                                .filter(x -> Stream.of(x.getWithdrawMtbColrs()).anyMatch(y -> y == mtbColrToDelete))
-                                .findSingle();
+            this.mColliCaricoRESTConsumer.deleteUDCRow(deleteUDCRowRequest, () -> {
+                Optional<PickingObjectDTO> pickingObjectDTO = Stream.of(this.mPickingList.getValue()).filter(x -> Stream.of(x.getWithdrawMtbColrs()).anyMatch(y -> y == mtbColrToDelete)).findSingle();
 
-                        if (pickingObjectDTO.isPresent()) {
-                            pickingObjectDTO.get().getWithdrawMtbColrs().remove(mtbColrToDelete);
-                        }
+                if (pickingObjectDTO.isPresent()) {
+                    pickingObjectDTO.get().getWithdrawMtbColrs().remove(mtbColrToDelete);
+                }
 
-                        this.mCurrentMtbColt.getMtbColr().remove(mtbColrToDelete);
+                this.mCurrentMtbColt.getMtbColr().remove(mtbColrToDelete);
 
-                        this.resetMatchedRows();
-                        this.sendOnRowSaved();
-                        this.sendOnLoadingEnded();
-                    }, this::sendError);
+                this.resetMatchedRows();
+                this.sendOnRowSaved();
+                this.sendOnLoadingEnded();
+            }, this::sendError);
 
         });
     }
@@ -804,8 +660,7 @@ public class AccettazioneBollaPickingViewModel {
                     this.sendOnLoadingEnded();
                 });
             } else {
-                CloseUDCRequestDTO closeUDCRequestDTO = new CloseUDCRequestDTO()
-                        .setMtbColt(mCurrentMtbColt);
+                CloseUDCRequestDTO closeUDCRequestDTO = new CloseUDCRequestDTO().setMtbColt(mCurrentMtbColt);
                 mColliCaricoRESTConsumer.closeUDC(closeUDCRequestDTO, closeUDCResponse -> {
 
                     Runnable onVersamentoCompleted = () -> {
@@ -859,11 +714,9 @@ public class AccettazioneBollaPickingViewModel {
         MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone();
         cloneMtbColt.setGestione(cloneMtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE ? GestioneEnum.PRODUZIONE : cloneMtbColt.getGestioneEnum());
 
-        var printUDSRequestDto = new PrintULRequestDTO()
-                .setMtbColt(cloneMtbColt);
+        var printUDSRequestDto = new PrintULRequestDTO().setMtbColt(cloneMtbColt);
 
-        this.mColliMagazzinoRESTConsumer.printUL(printUDSRequestDto, onComplete,
-                ex -> this.sendLUPrintError(ex, onComplete));
+        this.mColliMagazzinoRESTConsumer.printUL(printUDSRequestDto, onComplete, ex -> this.sendLUPrintError(ex, onComplete));
     }
 
     private void postCloseOperations() {
@@ -873,8 +726,7 @@ public class AccettazioneBollaPickingViewModel {
     }
 
     private void deleteLU(Runnable onComplete) {
-        DeleteULRequestDTO deleteULRequestDTO = new DeleteULRequestDTO()
-                .setMtbColt(this.mCurrentMtbColt);
+        DeleteULRequestDTO deleteULRequestDTO = new DeleteULRequestDTO().setMtbColt(this.mCurrentMtbColt);
 
         mColliMagazzinoRESTConsumer.deleteUL(deleteULRequestDTO, () -> {
             this.mCurrentMtbColt = null;
@@ -885,44 +737,30 @@ public class AccettazioneBollaPickingViewModel {
 
     public void resetMatchedRows() {
         for (PickingObjectDTO pickingObjectDTO : this.mPickingList.getValue()) {
-            pickingObjectDTO
-                    .setTempPickData(null);
+            pickingObjectDTO.setTempPickData(null);
         }
 
         this.mPickingList.postValue(this.mPickingList.getValue());
     }
 
     private void addHistoryItem(@NonNull MtbColr mtbColr) {
-        Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts)
-                .filter(x -> (x.getCodMart() != null && x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart())) ||
-                        (x.getCodMart() == null && x.getBarcode().equalsIgnoreCase(mtbColr.getCodBarre())))
-                .findFirst();
+        Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts).filter(x -> (x.getCodMart() != null && x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart())) || (x.getCodMart() == null && x.getBarcode().equalsIgnoreCase(mtbColr.getCodBarre()))).findFirst();
 
         if (optional.isPresent()) {
-            optional.get()
-                    .setPartitaMag(mtbColr.getPartitaMag())
-                    .setDataScad(mtbColr.getDataScadPartita());
+            optional.get().setPartitaMag(mtbColr.getPartitaMag()).setDataScad(mtbColr.getDataScadPartita());
         } else {
-            this.mHistoryUsedAarts.add(new HistoryMtbAartDTO()
-                    .setCodMart(mtbColr.getCodMart())
-                    .setBarcode(mtbColr.getCodBarre())
-                    .setPartitaMag(mtbColr.getPartitaMag())
-                    .setDataScad(mtbColr.getDataScadPartita()));
+            this.mHistoryUsedAarts.add(new HistoryMtbAartDTO().setCodMart(mtbColr.getCodMart()).setBarcode(mtbColr.getCodBarre()).setPartitaMag(mtbColr.getPartitaMag()).setDataScad(mtbColr.getDataScadPartita()));
         }
     }
 
     private HistoryMtbAartDTO getHistoryItemByCodMartIfExists(@NonNull String codMart) {
-        Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts)
-                .filter(x -> x.getCodMart().equalsIgnoreCase(codMart))
-                .findFirst();
+        Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts).filter(x -> x.getCodMart().equalsIgnoreCase(codMart)).findFirst();
 
         return optional.isPresent() ? optional.get() : null;
     }
 
     private HistoryMtbAartDTO getHistoryItemByBarcodeIfExists(@NonNull String barcode) {
-        Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts)
-                .filter(x -> x.getBarcode().equalsIgnoreCase(barcode))
-                .findFirst();
+        Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts).filter(x -> x.getBarcode().equalsIgnoreCase(barcode)).findFirst();
 
         return optional.isPresent() ? optional.get() : null;
     }
@@ -963,43 +801,9 @@ public class AccettazioneBollaPickingViewModel {
         if (this.mListener != null) mListener.onLUPrintError(ex, onComplete);
     }
 
-    private void sendOnItemDispatched(PickingObjectDTO pickingObjectDTO,
-                                      MtbAart mtbAart,
-                                      BigDecimal initialNumCnf,
-                                      BigDecimal initialQtaCnf,
-                                      BigDecimal initialQtaTot,
-                                      BigDecimal totalQtaOrd,
-                                      BigDecimal totalNumCnfOrd,
-                                      BigDecimal qtaCnfOrd,
-                                      BigDecimal totalQtaToBeTaken,
-                                      BigDecimal totalNumCnfToBeTaken,
-                                      BigDecimal qtaCnfToBeTaken,
-                                      BigDecimal totalQtaAvailable,
-                                      BigDecimal totalNumCnfAvailable,
-                                      BigDecimal qtaCnfAvailable,
-                                      String partitaMag,
-                                      LocalDate dataScad,
-                                      boolean canPartitaMagBeChanged,
-                                      RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
-        if (this.mListener != null) mListener.onItemDispatched(pickingObjectDTO,
-                mtbAart,
-                initialNumCnf,
-                initialQtaCnf,
-                initialQtaTot,
-                totalQtaOrd,
-                totalNumCnfOrd,
-                qtaCnfOrd,
-                totalQtaToBeTaken,
-                totalNumCnfToBeTaken,
-                qtaCnfToBeTaken,
-                totalQtaAvailable,
-                totalNumCnfAvailable,
-                qtaCnfAvailable,
-                partitaMag,
-                dataScad,
-                canPartitaMagBeChanged,
-                true,
-                onComplete);
+    private void sendOnItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canPartitaMagBeChanged, RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
+        if (this.mListener != null)
+            mListener.onItemDispatched(pickingObjectDTO, mtbAart, initialNumCnf, initialQtaCnf, initialQtaTot, totalQtaOrd, totalNumCnfOrd, qtaCnfOrd, totalQtaToBeTaken, totalNumCnfToBeTaken, qtaCnfToBeTaken, totalQtaAvailable, totalNumCnfAvailable, qtaCnfAvailable, partitaMag, dataScad, canPartitaMagBeChanged, true, onComplete);
     }
 
 
@@ -1019,16 +823,13 @@ public class AccettazioneBollaPickingViewModel {
         if (this.mListener != null) mListener.onMtbColrDeleteRequest(onComplete);
     }
 
-    private void notifyVersamentoAutomaticoResult(VersamentoAutomaticoULResponseDTO
-                                                          versamentoAutomaticoULResponseDTO, Runnable onComplete) {
+    private void notifyVersamentoAutomaticoResult(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete) {
         if (this.mListener != null)
             mListener.onULVersata(versamentoAutomaticoULResponseDTO, onComplete);
     }
 
-    private void sendOnUnknownBarcodeScanned(String
-                                                     barocde, RunnableArgs<String> onComplete, Runnable onAbort) {
-        if (this.mListener != null)
-            mListener.onUnknownBarcodeScanned(barocde, onComplete, onAbort);
+    private void sendOnUnknownBarcodeScanned(String barocde, RunnableArgs<String> onComplete, Runnable onAbort) {
+        if (this.mListener != null) mListener.onUnknownBarcodeScanned(barocde, onComplete, onAbort);
     }
 
     public AccettazioneBollaPickingViewModel setListeners(Listener listener) {
@@ -1045,25 +846,7 @@ public class AccettazioneBollaPickingViewModel {
 
         void onError(Exception ex);
 
-        void onItemDispatched(PickingObjectDTO pickingObjectDTO,
-                              MtbAart mtbAart,
-                              BigDecimal initialNumCnf,
-                              BigDecimal initialQtaCnf,
-                              BigDecimal initialQtaTot,
-                              BigDecimal totalQtaOrd,
-                              BigDecimal totalNumCnfOrd,
-                              BigDecimal qtaCnfOrd,
-                              BigDecimal totalQtaToBeTaken,
-                              BigDecimal totalNumCnfToBeTaken,
-                              BigDecimal qtaCnfToBeTaken,
-                              BigDecimal totalQtaAvailable,
-                              BigDecimal totalNumCnfAvailable,
-                              BigDecimal qtaCnfAvailable,
-                              String partitaMag,
-                              LocalDate dataScad,
-                              boolean canPartitaMagBeChanged,
-                              boolean canOverflowQuantity,
-                              RunnableArgss<PickedQuantityDTO, Boolean> onComplete);
+        void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canPartitaMagBeChanged, boolean canOverflowQuantity, RunnableArgss<PickedQuantityDTO, Boolean> onComplete);
 
         void onFilterCodMartApplied(String codMartToFilter);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
index 78f42a9e..617a3b2a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
@@ -355,7 +355,11 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         });
 
         accettazioneOrdiniPickingListAdapter.setOnItemClicked(clickedItem -> {
-            this.mViewModel.dispatchOrdineRow(clickedItem);
+            this.mViewModel.dispatchOrdineRow(clickedItem, false);
+        });
+
+        accettazioneOrdiniPickingListAdapter.setOnItemLongClicked(clickedItem -> {
+            this.mViewModel.dispatchOrdineRow(clickedItem, true);
         });
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
index 68bff77b..ab14ce33 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
@@ -141,7 +141,7 @@ public class AccettazioneOrdiniPickingViewModel {
                 .distinct()
                 .collect(Collectors.toList());
 
-        if(codAnagsOrd.size() == 1) foundCodAnag = codAnagsOrd.get(0);
+        if (codAnagsOrd.size() == 1) foundCodAnag = codAnagsOrd.get(0);
 
 
         //Definizione della gestione collo di default
@@ -248,7 +248,7 @@ public class AccettazioneOrdiniPickingViewModel {
             Ean128Model ean128Model = mEan128Service.decode(barcodeScanDTO);
 
             mColliAccettazioneRESTConsumer.checkBarcodeUl(ean128Model.Sscc, result -> {
-                if (result){
+                if (result) {
                     this.sendWarning("Barcode ul già registrato!", onComplete);
                 } else {
                     //Nel caso trovo un SSCC lo aggiungo
@@ -395,13 +395,13 @@ public class AccettazioneOrdiniPickingViewModel {
     }
 
     private void loadMatchedRows(List<PickingObjectDTO> matchedRows) {
-        if (matchedRows == null || matchedRows.size() == 0) {
+        if (matchedRows == null || matchedRows.isEmpty()) {
             this.sendError(new NoArtsFoundException());
         } else if (matchedRows.size() == 1) {
-            this.dispatchOrdineRow(matchedRows.get(0));
+            this.dispatchOrdineRow(matchedRows.get(0), false);
         } else {
             //So che il codMart sarà solo 1
-            var firstCodMart = Stream.of(matchedRows)
+            var firstCodMart = matchedRows.stream()
                     .map(x -> x.getSitArtOrdDTO().getCodMart())
                     .distinct()
                     .findFirst()
@@ -414,7 +414,7 @@ public class AccettazioneOrdiniPickingViewModel {
     public void createNewLU(String customSSCC, Integer customNumCollo, String customSerCollo, boolean disablePrint, Runnable onComplete) {
         this.sendOnInfoAggiuntiveRequest((additionalNotes, tCol) -> {
 
-            final List<CreateUDCRequestOrderDTO> orders = Stream.of(this.mOrders)
+            final List<CreateUDCRequestOrderDTO> orders = this.mOrders.stream()
                     .map(x -> {
                         final CreateUDCRequestOrderDTO createUDCRequestOrderDTO = new CreateUDCRequestOrderDTO()
                                 .setDataCons(x.getDataConsD() != null ? UtilityDate.toLocalDate(x.getDataConsD()) : null)
@@ -432,7 +432,7 @@ public class AccettazioneOrdiniPickingViewModel {
 
                         return createUDCRequestOrderDTO;
                     })
-                    .toList();
+                    .collect(Collectors.toList());
 
             final CreateUDCRequestDTO createUDCRequestDTO = new CreateUDCRequestDTO()
                     .setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep())
@@ -457,7 +457,7 @@ public class AccettazioneOrdiniPickingViewModel {
     }
 
 
-    public void dispatchOrdineRow(final PickingObjectDTO pickingObjectDTO) {
+    public void dispatchOrdineRow(final PickingObjectDTO pickingObjectDTO, boolean executeImmediately) {
         if (this.mCurrentMtbColt == null) return;
 
         BigDecimal totalQtaOrd = pickingObjectDTO.getSitArtOrdDTO().getQtaOrd();
@@ -467,7 +467,7 @@ public class AccettazioneOrdiniPickingViewModel {
         AtomicBigDecimal numCnfWithdrawRows = new AtomicBigDecimal();
         AtomicBigDecimal qtaColWithdrawRows = new AtomicBigDecimal();
 
-        Stream.of(pickingObjectDTO.getWithdrawMtbColrs())
+        pickingObjectDTO.getWithdrawMtbColrs()
                 .forEach(row -> {
                     numCnfWithdrawRows.addAndGet(row.getNumCnf());
                     qtaColWithdrawRows.addAndGet(row.getQtaCol());
@@ -568,33 +568,42 @@ public class AccettazioneOrdiniPickingViewModel {
             }
         }
 
-        this.sendOnItemDispatched(
-                pickingObjectDTO,
-                pickingObjectDTO.getMtbAart(),
-                initialNumCnf, initialQtaCnf, initialQtaTot,
-                qtaDaEvadere,
-                numCnfDaEvadere,
-                qtaCnfDaEvadere,
-                qtaColDaPrelevare,
-                numCnfDaPrelevare,
-                qtaCnfDaPrelevare,
-                null,
-                null,
-                null,
-                partitaMag,
-                dataScad,
-                true,
-                pickingObjectDTO.getSitArtOrdDTO().getDescrizioneEstesaOrd(),
-                (pickedQuantityDTO, shouldCloseLU) -> {
-                    this.saveNewRow(pickingObjectDTO,
-                            pickedQuantityDTO.getNumCnf(),
-                            pickedQuantityDTO.getQtaCnf(),
-                            pickedQuantityDTO.getQtaTot(),
-                            pickedQuantityDTO.getPartitaMag(),
-                            pickedQuantityDTO.getDataScad(),
-                            shouldCloseLU);
-                });
-
+        if (executeImmediately) {
+            this.saveNewRow(pickingObjectDTO,
+                    numCnfDaPrelevare,
+                    qtaCnfDaPrelevare,
+                    qtaColDaPrelevare,
+                    partitaMag,
+                    dataScad,
+                    false);
+        } else {
+            this.sendOnItemDispatched(
+                    pickingObjectDTO,
+                    pickingObjectDTO.getMtbAart(),
+                    initialNumCnf, initialQtaCnf, initialQtaTot,
+                    qtaDaEvadere,
+                    numCnfDaEvadere,
+                    qtaCnfDaEvadere,
+                    qtaColDaPrelevare,
+                    numCnfDaPrelevare,
+                    qtaCnfDaPrelevare,
+                    null,
+                    null,
+                    null,
+                    partitaMag,
+                    dataScad,
+                    true,
+                    pickingObjectDTO.getSitArtOrdDTO().getDescrizioneEstesaOrd(),
+                    (pickedQuantityDTO, shouldCloseLU) -> {
+                        this.saveNewRow(pickingObjectDTO,
+                                pickedQuantityDTO.getNumCnf(),
+                                pickedQuantityDTO.getQtaCnf(),
+                                pickedQuantityDTO.getQtaTot(),
+                                pickedQuantityDTO.getPartitaMag(),
+                                pickedQuantityDTO.getDataScad(),
+                                shouldCloseLU);
+                    });
+        }
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java
index be2a0554..eb21ba04 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java
@@ -21,7 +21,6 @@ import java.util.List;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.AccettazioneOrdineInevasoMainListGroupHeaderBinding;
@@ -35,6 +34,7 @@ public class AccettazioneOrdiniPickingListAdapter extends SectionedRecyclerViewA
     private final List<AccettazioneOrdiniPickingListModel> mDataset = new ArrayList<>();
 
     private RunnableArgs<PickingObjectDTO> mOnItemClicked;
+    private RunnableArgs<PickingObjectDTO> mOnItemLongClicked;
 
     static class SubheaderHolder extends RecyclerView.ViewHolder {
 
@@ -77,6 +77,10 @@ public class AccettazioneOrdiniPickingListAdapter extends SectionedRecyclerViewA
         this.mOnItemClicked = onItemClicked;
     }
 
+    public void setOnItemLongClicked(RunnableArgs<PickingObjectDTO> onItemLongClicked) {
+        this.mOnItemLongClicked = onItemLongClicked;
+    }
+
 
     @Override
     public SubheaderHolder onCreateSubheaderViewHolder(ViewGroup parent, int viewType) {
@@ -154,6 +158,12 @@ public class AccettazioneOrdiniPickingListAdapter extends SectionedRecyclerViewA
             if (this.mOnItemClicked != null)
                 this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel());
         });
+
+        holder.mBinding.getRoot().setOnLongClickListener(v -> {
+            if (this.mOnItemLongClicked != null)
+                this.mOnItemLongClicked.run(pickingObjectDTO.getOriginalModel());
+            return true;
+        });
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
index 2b10d80b..fd94aff5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
@@ -38,6 +38,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.interfaces.ILifecycleFragment;
 import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.model.JtbComt;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
@@ -54,6 +55,7 @@ import it.integry.integrywmsnative.ui.ElevatedToolbar;
 import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalView;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteView;
+import it.integry.integrywmsnative.view.dialogs.ask_commessa.DialogAskCommessaView;
 import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaProdView;
 import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.dto.DialogAskLineaProdResponse;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
@@ -90,12 +92,13 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
     private GestioneEnum mCurrentGestione;
     private boolean mAskCliente;
     private boolean mAskLineaProd;
+    private boolean mAskCommessa;
 
     public PickingLiberoFragment() {
         // Required empty public constructor
     }
 
-    public static PickingLiberoFragment newInstance(@StringRes int title, GestioneEnum gestioneEnum, boolean askCliente, boolean askLineaProd) {
+    public static PickingLiberoFragment newInstance(@StringRes int title, GestioneEnum gestioneEnum, boolean askCliente, boolean askLineaProd, boolean flagAskCommessaInPickingLiberoLav) {
         PickingLiberoFragment fragment = new PickingLiberoFragment();
         Bundle args = new Bundle();
 
@@ -103,6 +106,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
         args.putString("gestione", gestioneEnum.getText());
         args.putBoolean("askCliente", askCliente);
         args.putBoolean("askLineaProd", askLineaProd);
+        args.putBoolean("askCommessa", flagAskCommessaInPickingLiberoLav);
 
         fragment.setArguments(args);
         return fragment;
@@ -121,6 +125,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
         mCurrentGestione = GestioneEnum.fromString(getArguments().getString("gestione"));
         mAskCliente = getArguments().getBoolean("askCliente");
         mAskLineaProd = getArguments().getBoolean("askLineaProd");
+        mAskCommessa = getArguments().getBoolean("askCommessa");
 
 
         mToolbarTitleText.setText(getText(getArguments().getInt("title")).toString());
@@ -150,7 +155,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
 
         this.initRecyclerView();
 
-        mViewModel.init(mAskCliente, mAskLineaProd, mCurrentGestione);
+        mViewModel.init(mAskCliente, mAskLineaProd, mAskCommessa, mCurrentGestione);
 
         return mBindings.getRoot();
     }
@@ -303,6 +308,12 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
                 .show(getParentFragmentManager(), DialogAskLineaProdView.class.getName());
     }
 
+    @Override
+    public void onLUCommessaRequired(RunnableArgs<JtbComt> onComplete, Runnable onAbort) {
+        DialogAskCommessaView.newInstance(onComplete, onAbort)
+                .show(getParentFragmentManager(), DialogAskCommessaView.class.getName());
+    }
+
     @Override
     public void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
         DialogChooseArtsFromMtbColrList
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
index 8ea43452..e946dea0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
@@ -24,12 +24,14 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILUBaseOperationsListener;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.model.CommonModelConsts;
+import it.integry.integrywmsnative.core.model.JtbComt;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
 import it.integry.integrywmsnative.core.model.VtbDest;
+import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
@@ -45,6 +47,7 @@ import it.integry.integrywmsnative.core.rest.model.Ean128Model;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPickItemRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPickItemsRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
@@ -76,8 +79,11 @@ public class PickingLiberoViewModel {
 
     private boolean mFlagAskCliente;
     private boolean mFlagAskLineaProd;
+    private boolean mFlagAskCommessa;
     private GestioneEnum mDefaultGestione;
 
+    private JtbComt mDefaultCommessa;
+
 
     private Listener mListener;
 
@@ -102,9 +108,10 @@ public class PickingLiberoViewModel {
     }
 
 
-    public void init(boolean flagAskCliente, boolean flagAskLineaProd, GestioneEnum defaultGestione) {
+    public void init(boolean flagAskCliente, boolean flagAskLineaProd, boolean flagAskCommessa, GestioneEnum defaultGestione) {
         this.mFlagAskCliente = defaultGestione == GestioneEnum.VENDITA && flagAskCliente;
         this.mFlagAskLineaProd = defaultGestione == GestioneEnum.LAVORAZIONE && flagAskLineaProd;
+        this.mFlagAskCommessa = defaultGestione == GestioneEnum.LAVORAZIONE && flagAskCommessa;
         this.mDefaultGestione = defaultGestione;
 
 
@@ -142,7 +149,7 @@ public class PickingLiberoViewModel {
             //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
             this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);
 
-        } else if (SettingsManager.iDB().isFlagPickingLiberoEnableScanArt()){
+        } else if (SettingsManager.iDB().isFlagPickingLiberoEnableScanArt()) {
             //Cerco tramite ean13  un collo  in posizione mono ul definita in anagrafica articolo, altrimenti se abilitato procedo con picking manuale
             this.loadArticolo(barcodeScanDTO.getStringValue(), null, onComplete);
         } else {
@@ -316,9 +323,7 @@ public class PickingLiberoViewModel {
         if (this.mFlagAskCliente) {
             this.sendLUClienteRequired((vtbDest, codJcom) -> {
                 createNewLU_PostClienteAsk(customNumCollo, customSerCollo, vtbDest, onComplete);
-            }, () -> {
-
-            });
+            }, this::sendOnLoadingEnded);
         } else {
             createNewLU_PostClienteAsk(customNumCollo, customSerCollo, null, onComplete);
         }
@@ -329,15 +334,25 @@ public class PickingLiberoViewModel {
             this.sendLULineaProdRequired(response -> {
                 createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, response.getPosizione(), response.getIdLotto(), onComplete);
 
-            }, () -> {
-                this.sendOnLoadingEnded();
-            });
+            }, this::sendOnLoadingEnded);
         } else {
             createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, null, null, onComplete);
         }
     }
 
-    private void createNewLU_PostLineaProdAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, String codJfas, Integer idLotto, Runnable onComplete) {
+    private void createNewLU_PostLineaProdAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, String posizione, Integer idLotto, Runnable onComplete) {
+        if (this.mFlagAskCommessa) {
+            this.sendLUCommessaRequired(response -> {
+                createNewLU_PostCommessaAsk(customNumCollo, customSerCollo, vtbDest, posizione, idLotto, response, onComplete);
+
+            }, this::sendOnLoadingEnded);
+        } else {
+            createNewLU_PostCommessaAsk(customNumCollo, customSerCollo, vtbDest, null, null, null, onComplete);
+        }
+    }
+
+    private void createNewLU_PostCommessaAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, String codJfas, Integer idLotto, JtbComt codJcom, Runnable onComplete) {
+        this.mDefaultCommessa = codJcom;
 
         this.sendOnLoadingStarted();
 
@@ -536,61 +551,23 @@ public class PickingLiberoViewModel {
             if (!pickedAarts.isEmpty()) {
                 askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> {
                     if (!destNewMtbColr.isEmpty()) {
-                        MtbColt clonedTestata = (MtbColt) this.mCurrentMtbColt.clone();
-                        clonedTestata.setOperation(CommonModelConsts.OPERATION.UPDATE);
 
-                        ObservableArrayList<MtbColr> mtbColrObservableField = new ObservableArrayList<>();
+                        destNewMtbColr.forEach(x -> x.setCodJcom(this.mDefaultCommessa.getCodJcom()));
 
-                        for (int i = 0; i < destNewMtbColr.size(); i++) {
-                            MtbColr cloneMtbColr = (MtbColr) destNewMtbColr.get(i).clone();
+                        MtbColt clonedTestata = (MtbColt) sourceMtbColt.clone();
+                        clonedTestata.getMtbColr().clear();
+                        clonedTestata.getMtbColr().addAll(destNewMtbColr);
 
-                            cloneMtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
+                        mColliMagazzinoRESTConsumer.spostaArtsTraUL(clonedTestata,
+                                this.mCurrentMtbColt, true, (generatedMtbColrs) -> {
 
-                            cloneMtbColr
-                                    .setGestioneRif(cloneMtbColr.getGestione())
-                                    .setGestione((String) null)
+                                    mCurrentMtbColt.getMtbColr().addAll(generatedMtbColrs);
 
-                                    .setSerColloRif(cloneMtbColr.getSerCollo())
-                                    .setSerCollo(null)
+                                    this.sendOnRowSaved();
+                                    this.sendOnLoadingEnded();
+                                    onComplete.run();
+                                }, this::sendError);
 
-                                    .setNumColloRif(cloneMtbColr.getNumCollo())
-                                    .setNumCollo(null)
-
-                                    .setDataColloRif(cloneMtbColr.getDataColloS())
-                                    .setDataCollo((String) null)
-
-                                    .setPesoLordoKg(null)
-                                    .setPesoNettoKg(null);
-
-                            mtbColrObservableField.add(cloneMtbColr);
-                        }
-
-                        clonedTestata.setMtbColr(mtbColrObservableField);
-
-                        new Thread(() -> {
-                            mColliMagazzinoRESTConsumer.saveCollo(clonedTestata, value -> {
-                                for (int i = 0; i < mtbColrObservableField.size(); i++) {
-                                    MtbColr initialMtbColr = mtbColrObservableField.get(i);
-                                    var startIdx = (value.getMtbColr().size() - mtbColrObservableField.size());
-
-                                    initialMtbColr
-                                            .setDataCollo(value.getDataColloS())
-                                            .setNumCollo(value.getNumCollo())
-                                            .setGestione(value.getGestione())
-                                            .setSerCollo(value.getSerCollo());
-
-                                    initialMtbColr.setRiga(value.getMtbColr().get(startIdx + i).getRiga());
-                                    mCurrentMtbColt.getMtbColr().add(mtbColrObservableField.get(i));
-                                }
-
-                                this.sendOnRowSaved();
-                                this.sendOnLoadingEnded();
-
-                                onComplete.run();
-
-                            }, this::sendError);
-
-                        }).start();
                     }
                 }, onComplete);
             } else {
@@ -675,7 +652,8 @@ public class PickingLiberoViewModel {
                 .setQtaCnf(qtaCnf)
                 .setNumCnf(numCnf)
                 .setDescrizione(pickingObjectDTO.getMtbAart().getDescrizioneEstesa())
-                .setDatetimeRow(UtilityDate.getDateInstance());
+                .setDatetimeRow(UtilityDate.getDateInstance())
+                .setCodJcom(this.mDefaultCommessa.getCodJcom());
 
         mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
@@ -888,6 +866,7 @@ public class PickingLiberoViewModel {
         }
 
         this.sendOnLoadingStarted();
+        this.mDefaultCommessa = null;
 
         mColliMagazzinoRESTConsumer.canULBeDeleted(mCurrentMtbColt, canBeDeleted -> {
             if (canBeDeleted) {
@@ -901,7 +880,18 @@ public class PickingLiberoViewModel {
             } else {
 
                 this.mColliMagazzinoRESTConsumer.assegnaLottoSuColloScarico(mCurrentMtbColt, () -> {
-                    this.mColliMagazzinoRESTConsumer.updateDataFine(mCurrentMtbColt, () -> {
+
+                    var closeUDSRequest = new CloseUDSRequestDTO()
+                            .setMtbColt(mCurrentMtbColt);
+
+                    if (this.mDefaultGestione == GestioneEnum.LAVORAZIONE) {
+                        closeUDSRequest
+                                .setCreateDocument(SettingsManager.iDB().isProduzioneGeneraDocScar())
+                                .setDocumentCodDtip(SettingsManager.iDB().getProduzioneCodDtipScar())
+                                .setDocumentCodAnag(SettingsManager.iDB().getInternalCodAnags().stream().filter(InternalCodAnagsDTO::isFornitore).findFirst().get().getCodAnag());
+                    }
+
+                    this.mColliScaricoRESTConsumer.closeUDS(closeUDSRequest, response -> {
                         this.sendLUClosed();
                         this.sendOnLoadingEnded();
 
@@ -956,6 +946,10 @@ public class PickingLiberoViewModel {
         if (this.mListener != null) mListener.onLULineaProdRequired(onComplete, onAbort);
     }
 
+    private void sendLUCommessaRequired(RunnableArgs<JtbComt> onComplete, Runnable onAbort) {
+        if (this.mListener != null) mListener.onLUCommessaRequired(onComplete, onAbort);
+    }
+
     private void sendArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
         if (this.mListener != null)
             mListener.onArtSelectionRequest(mtbColrsToPick, mtbAart, onComplete, onAbort);
@@ -1014,6 +1008,8 @@ public class PickingLiberoViewModel {
 
         void onLULineaProdRequired(RunnableArgs<DialogAskLineaProdResponse> onComplete, Runnable onAbort);
 
+        void onLUCommessaRequired(RunnableArgs<JtbComt> onComplete, Runnable onAbort);
+
         void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort);
 
         void onItemDispatched(PickingObjectDTO pickingObjectDTO,
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java
index f33cbcce..7999621e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java
@@ -208,6 +208,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
                             .setDescrizione(x.getDescrizioneArt())
                             .setNumCollo(x.getNumColloRif())
                             .setPartitaMag(x.getPartitaMag())
+                            .setCodJcom(x.getCodJcom())
                             .setQtaVersata(x.getQtaCol())
                             .setUntMisVersata(x.getUntMis());
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
index bfa6841a..adfa25e9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
@@ -67,9 +67,10 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "           dtb_ord_steps.gestione                                    as gestione_ord, " +
                 "           dtb_ord_steps.hr_num                                      as hr, " +
                 "           mtb_colr.riga_ord, " +
-                "           CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / " +
-                "                                   SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
-                "                                  0))                                as percentage_hr " +
+                "           CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) /\n" +
+                "                                                IIF(SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo) = 0, 1,\n" +
+                "                                                    SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo))) * 100,\n" +
+                "                                               0))                                AS percentage_hr " +
                 "    FROM mtb_colr " +
                 "             INNER JOIN mtb_colt ON mtb_colr.num_collo = mtb_colt.num_collo " +
                 "        AND mtb_colr.data_collo = mtb_colt.data_collo " +
@@ -249,8 +250,10 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                                 .setCodJfas(restDTO.getCodJfas())
                                 .setDescrizioneArt(restDTO.getDescrizioneArt())
                                 .setDescrizioneFase(restDTO.getDescrizioneFase())
-                                .setQtaCol(qtaColTot)
-                                .setNumCnf(numCnfColTot)
+                                .setQtaCol(restDTO.getQtaCol())
+                                .setNumCnf(restDTO.getNumCnf())
+//                                .setQtaCol(qtaColTot)
+//                                .setNumCnf(numCnfColTot)
                                 .setPartitaMag(restDTO.getPartitaMag())
                                 .setCodJcom(restDTO.getCodJcom())
                                 .setDatetimeRow(restDTO.getDatetimeRow())
@@ -273,7 +276,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
 
                 this.mArticoloRESTConsumer.getByCodMarts(codMarts, arts -> {
 
-                    if (arts != null && arts.size() > 0) {
+                    if (arts != null && !arts.isEmpty()) {
                         for (HistoryVersamentoProdULDTO value : newUlList) {
 
                             MtbAart foundMtbAart = null;
@@ -281,7 +284,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                             List<MtbAart> mtbAartStream = Stream.of(arts)
                                     .filter(x -> x.getCodMart().equalsIgnoreCase(value.getCodMart())).toList();
 
-                            if (mtbAartStream != null && mtbAartStream.size() > 0) {
+                            if (mtbAartStream != null && !mtbAartStream.isEmpty()) {
                                 foundMtbAart = mtbAartStream.get(0);
                             }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListAdapter.java
index fd503ac2..1e881e3f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListAdapter.java
@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.ui;
 
 import android.content.Context;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.databinding.DataBindingUtil;
@@ -98,7 +99,12 @@ public class HistoryULsListAdapter extends ExtendedSectionedRecyclerView<History
         holder.binding.codMart.setText(ul.getCodMart());
         holder.binding.descrizione.setText(ul.getDescrizione());
         holder.binding.numCollo.setText(String.valueOf(ul.getNumCollo()));
-        holder.binding.partitaMag.setText("(" + ul.getPartitaMag() + ")");
+
+        holder.binding.partitaMagContainer.setVisibility(UtilityString.isNullOrEmpty(ul.getPartitaMag()) ? View.GONE : View.VISIBLE);
+        holder.binding.partitaMag.setText(ul.getPartitaMag());
+
+        holder.binding.commessaContainer.setVisibility(UtilityString.isNullOrEmpty(ul.getCodJcom()) ? View.GONE : View.VISIBLE);
+        holder.binding.commessa.setText(ul.getCodJcom());
 
         holder.binding.qtaVersata.setText(UtilityNumber.decimalToString(ul.getQtaVersata(), 2));
         holder.binding.untMisQtaVersata.setText(String.valueOf(ul.getUntMisVersata()));
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListModel.java
index 4ec813e5..5750f69e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListModel.java
@@ -12,6 +12,7 @@ public class HistoryULsListModel {
     private String codMart;
     private String descrizione;
     private String partitaMag;
+    private String codJcom;
 
     private BigDecimal qtaVersata;
     private String untMisVersata;
@@ -63,6 +64,15 @@ public class HistoryULsListModel {
         return this;
     }
 
+    public String getCodJcom() {
+        return codJcom;
+    }
+
+    public HistoryULsListModel setCodJcom(String codJcom) {
+        this.codJcom = codJcom;
+        return this;
+    }
+
     public BigDecimal getQtaVersata() {
         return qtaVersata;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java
index cd1ba4f9..4e00882f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java
@@ -2,8 +2,6 @@ package it.integry.integrywmsnative.gest.prod_rientro_merce;
 
 import androidx.lifecycle.MutableLiveData;
 
-import com.annimon.stream.Stream;
-
 import java.util.List;
 
 import javax.inject.Inject;
@@ -13,7 +11,6 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.IOrdersLo
 import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
-import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneStatoEnum;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.OrdersLoadException;
 
 public class ProdRientroMerceViewModel {
@@ -37,10 +34,11 @@ public class ProdRientroMerceViewModel {
         this.mMesRESTConsumer.getOrdiniLavorazione("I", null, codAnag, ordiniLavorazioneList -> {
             List<OrdineLavorazioneDTO> filteredList = null;
 
-            if(ordiniLavorazioneList != null)
-                filteredList = Stream.of(ordiniLavorazioneList)
-                    .filter(x -> x.getStatoEnum() != OrdineLavorazioneStatoEnum.PROGRAMMATO)
-                    .toList();
+            filteredList = ordiniLavorazioneList;
+//            if(ordiniLavorazioneList != null)
+//                filteredList = ordiniLavorazioneList.stream()
+//                    .filter(x -> x.getStatoEnum() != OrdineLavorazioneStatoEnum.PROGRAMMATO)
+//                    .collect(Collectors.toList());
 
             this.mOrdiniLavorazioneAperti.postValue(filteredList);
             this.sendOnOrdersLoadingEnded();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
index 7962a280..15bde7f6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
@@ -87,7 +87,7 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
     public ObservableField<BigDecimal> sumNetKG = new ObservableField<>(BigDecimal.ZERO);
     public ObservableField<BigDecimal> sumGrossKG = new ObservableField<>(BigDecimal.ZERO);
     public ObservableField<Integer> progress = new ObservableField<>(0);
-    public boolean isOrderColli = false;
+    public ObservableField<Boolean> isOrderColli = new ObservableField<>(false);
 
     public ProdRientroMerceOrderDetailFragment() {
         // Required empty public constructor
@@ -121,7 +121,6 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
 
         if (currentOrder.getValue() != null) {
             refreshOrder();
-            isOrderColli = currentOrder.getValue().getQtaCnf().compareTo(BigDecimal.ONE) == 0;
         }
         this.mViewModel.mtbColtsOfOrder.observe(getViewLifecycleOwner(), this::refreshList);
 
@@ -200,9 +199,15 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
     }
 
     private void refreshOrder() {
+        OrdineLavorazioneDTO currentOrd = currentOrder.getValue();
+
+        if(currentOrd != null) {
+            isOrderColli.set(currentOrd.getQtaCnf().compareTo(BigDecimal.ONE) == 0);
+        }
+
         if (mBindings != null) mBindings.invalidateAll();
         if (mAdapter != null) mAdapter.clearDataset();
-        if (mViewModel != null) mViewModel.setOrder(currentOrder.getValue());
+        if (mViewModel != null) mViewModel.setOrder(currentOrd);
     }
 
     private void refreshList(List<MtbColt> mtbColts) {
@@ -402,6 +407,16 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
             return ContextCompat.getDrawable(requireActivity(), R.drawable.label_primary_text);
     }
 
+    public Drawable getUntMisIcon() {
+        if (currentOrder.getValue() != null) {
+            if(currentOrder.getValue().getUntOrd().equalsIgnoreCase("KG"))
+                return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_weight_kg);
+             else
+                return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_puzzle);
+        } else
+            return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_weight_kg);
+    }
+
     public Integer getOrderStatusLabelTextColor() {
         if (currentOrder.getValue() != null) {
             switch (currentOrder.getValue().getStatoEnum()) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
index 152f96a3..1c68cd95 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
@@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData;
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
 
@@ -68,36 +68,33 @@ public class ProdRientroMerceOrderDetailViewModel {
 
     public void createLU(ProdRientroMerceOrderDetailPickedQuantityDTO pickedQuantityDTO) {
 
-        new Thread(this::sendOnLoadingStarted).start();
+        this.sendOnLoadingStarted();
 
-        new Thread(() -> {
+        ImportColliDaProduzioneRequestDTO importColliDaProduzioneRequestDTO =
+                new ImportColliDaProduzioneRequestDTO()
+                        .setColliBancale(pickedQuantityDTO.getNumCnf().intValue())
+                        .setQtaCnf(pickedQuantityDTO.getPesoCollo())
+                        .setQtaCol(pickedQuantityDTO.getPesoNetto())
+                        .setCodJcom(currentOrder.getCodJcom())
+//                        .setCodJfas("OFF")
+                        .setCodJfas(pickedQuantityDTO.getJtbFasi() != null ? pickedQuantityDTO.getJtbFasi().getCodJfas() : null)
+                        .setCodMart(currentOrder.getCodProd())
+                        .setCodTcol(pickedQuantityDTO.getMtbTCol() != null ? pickedQuantityDTO.getMtbTCol().getCodTcol() : null)
+                        .setDataCollo(LocalDate.now())
+                        .setDataOrd(currentOrder.getDataOrdD())
+                        .setNumOrd(currentOrder.getNumOrd())
+                        .setGestione(currentOrder.getGestione())
+                        .setPartitaMag(currentOrder.getPartitaMag())
+                        .setFornitore(currentOrder.getRagSocAnag())
+                        .setPesoLordo(pickedQuantityDTO.getPesoLordo())
+                        .setPesoNetto(pickedQuantityDTO.getPesoNetto());
 
-            ImportColliDaProduzioneRequestDTO importColliDaProduzioneRequestDTO =
-                    new ImportColliDaProduzioneRequestDTO()
-                            .setColliBancale(pickedQuantityDTO.getNumCnf().intValue())
-                            .setQtaCnf(pickedQuantityDTO.getPesoCollo())
-                            .setQtaCol(pickedQuantityDTO.getPesoNetto())
-                            .setCodJcom(currentOrder.getCodJcom())
-                            .setCodJfas(pickedQuantityDTO.getJtbFasi() != null ? pickedQuantityDTO.getJtbFasi().getCodJfas() : null)
-                            .setCodMart(currentOrder.getCodProd())
-                            .setCodTcol(pickedQuantityDTO.getMtbTCol() != null ? pickedQuantityDTO.getMtbTCol().getCodTcol() : null)
-                            .setDataCollo(new Date())
-                            .setDataOrd(currentOrder.getDataOrdD())
-                            .setNumOrd(currentOrder.getNumOrd())
-                            .setGestione(currentOrder.getGestione())
-                            .setPartitaMag(currentOrder.getPartitaMag())
-                            .setFornitore(currentOrder.getRagSocAnag())
-                            .setPesoLordo(pickedQuantityDTO.getPesoLordo())
-                            .setPesoNetto(pickedQuantityDTO.getPesoNetto());
+        this.mProdRientroMerceOrderDetailRESTConsumer.importColloDaProduzione(importColliDaProduzioneRequestDTO, mtbColtSaved -> {
+            synchronized (this.mtbColtsOfOrder) {
+                this.mListener.onDataSaved(mtbColtSaved);
+            }
+        }, this::sendError);
 
-            this.mProdRientroMerceOrderDetailRESTConsumer.importColloDaProduzione(importColliDaProduzioneRequestDTO, mtbColtSaved -> {
-                synchronized (this.mtbColtsOfOrder) {
-                    this.mListener.onDataSaved(mtbColtSaved);
-                }
-            }, this::sendError);
-
-
-        }).start();
 
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/dto/ImportColliDaProduzioneRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/dto/ImportColliDaProduzioneRequestDTO.java
index e7e53d50..da274fa6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/dto/ImportColliDaProduzioneRequestDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/dto/ImportColliDaProduzioneRequestDTO.java
@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.dto;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 
 public class ImportColliDaProduzioneRequestDTO {
@@ -15,7 +16,7 @@ public class ImportColliDaProduzioneRequestDTO {
 
     private int colliBancale;
     private BigDecimal qtaCnf;
-    private Date dataCollo;
+    private LocalDate dataCollo;
 
     private Date dataOrd;
     private int numOrd;
@@ -107,11 +108,11 @@ public class ImportColliDaProduzioneRequestDTO {
         return this;
     }
 
-    public Date getDataCollo() {
+    public LocalDate getDataCollo() {
         return dataCollo;
     }
 
-    public ImportColliDaProduzioneRequestDTO setDataCollo(Date dataCollo) {
+    public ImportColliDaProduzioneRequestDTO setDataCollo(LocalDate dataCollo) {
         this.dataCollo = dataCollo;
         return this;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdViewModel.java
index f08c9147..d3544ba3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdViewModel.java
@@ -229,15 +229,20 @@ public class ProdRiposizionamentoDaProdViewModel {
     }
 
     public void loadData() {
-        List<String> posizioni = Arrays.asList(SettingsManager.iDB().getViewPosizioni().split("\\|"));
+        String posizioniToSee = SettingsManager.iDB().getViewPosizioni();
+        if(posizioniToSee == null || posizioniToSee.isEmpty()) {
+            this.sendOnInventoriesLoadingEnded();
+            return;
+        }
+
+        List<String> posizioni = Arrays.asList(posizioniToSee.split("\\|"));
 
         this.mGiacenzaRESTConsumer.getGiacenzeInPosizione(posizioni, true, availableItems -> {
-            availableItems = Stream.of(availableItems)
+            availableItems = availableItems.stream()
                     .sorted(Comparator.comparing(ArtsInGiacenzaDTO::getPosizione))
-                    .toList();
+                    .collect(Collectors.toList());
 
             itemsInventario.postValue(availableItems);
-            this.sendOnInventoriesLoadingEnded();
         }, this::sendError);
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index 2ca1a6a5..34757538 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -39,6 +39,7 @@ import it.integry.integrywmsnative.core.expansion.BaseActivity;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
+import it.integry.integrywmsnative.core.expansion.RunnableArgssss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
@@ -81,7 +82,6 @@ import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAgg
 import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowQtaTotOrderedQuantityException;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtView;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiView;
 import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
@@ -319,15 +319,18 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         this.mBindings.spedizionePickingList.setAdapter(spedizioneListAdapter);
         this.mBindings.spedizionePickingList.setLayoutManager(new LinearLayoutManager(this));
 
-        spedizioneListAdapter.setOnItemClicked((clickedItem, refMtbColt, refMtbColr) -> {
+        RunnableArgssss<PickingObjectDTO, MtbColt, MtbColr, Boolean> onItemClicked = (clickedItem, refMtbColt, refMtbColr, executeImmediately) -> {
             if (!noLUPresent.get() &&
                     ((SettingsManager.iDB().isFlagSpedizioneEnableManualPick() &&
                             clickedItem.getSitArtOrdDTO().isFlagEnablePickManuale()) ||
                             clickedItem.getTempPickData() != null)) {
                 this.mViewmodel.dispatchOrdineRow(clickedItem, refMtbColt, refMtbColr,
-                        SettingsManager.iDB().isFlagSpedizioneEnableManualPick() && clickedItem.getSitArtOrdDTO().isFlagEnablePickManuale());
+                        SettingsManager.iDB().isFlagSpedizioneEnableManualPick() && clickedItem.getSitArtOrdDTO().isFlagEnablePickManuale(), executeImmediately);
             }
-        });
+        };
+
+        spedizioneListAdapter.setOnItemClicked(onItemClicked);
+        spedizioneListAdapter.setOnItemLongClicked(onItemClicked);
     }
 
 
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 52d48cfb..34bfd90b 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
@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.gest.spedizione;
 
-import androidx.annotation.IntegerRes;
 import androidx.databinding.ObservableArrayList;
 import androidx.lifecycle.MutableLiveData;
 
@@ -11,18 +10,15 @@ import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
-import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
 import it.integry.integrywmsnative.core.exception.EmptyLUException;
@@ -65,6 +61,7 @@ import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliScaricoRESTConsumerInterface;
+import it.integry.integrywmsnative.core.rest.model.CriterioDistribuzioneEnum;
 import it.integry.integrywmsnative.core.rest.model.Ean128Model;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 import it.integry.integrywmsnative.core.rest.model.LoadColliDTO;
@@ -89,7 +86,6 @@ import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityPosizione;
-import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.CurrentMonoLUPositionIsNotCorrectException;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidMagazzinoAutomaticoMovementException;
@@ -99,7 +95,6 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.OrdersLoadExceptio
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowQtaTotOrderedQuantityException;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.TracciamentoImballoDTO;
 
 public class SpedizioneViewModel {
@@ -882,7 +877,7 @@ public class SpedizioneViewModel {
                     refMtbColt = matchedItem.getTempPickData().getSourceMtbColt();
                 }
                 MtbColr refMtbColr = refMtbColt != null ? refMtbColt.getMtbColr().get(0) : null;
-                this.dispatchOrdineRow(matchedItem, refMtbColt, refMtbColr, refMtbColr == null);
+                this.dispatchOrdineRow(matchedItem, refMtbColt, refMtbColr, refMtbColr == null, false);
             }
 
         } else {
@@ -901,7 +896,7 @@ public class SpedizioneViewModel {
     }
 
 
-    public void dispatchOrdineRow(final PickingObjectDTO pickingObjectDTO, MtbColt refMtbColt, MtbColr refMtbColr, boolean canPartitaMagBeChanged) {
+    public void dispatchOrdineRow(final PickingObjectDTO pickingObjectDTO, MtbColt refMtbColt, MtbColr refMtbColr, boolean canPartitaMagBeChanged, boolean executeImmediately) {
 
         //TODO: Al posto di prelevare la prima riga bisognerebbe controllare se c'è ne una che corrisponde con la partita richiesta
 //        MtbColr refMtbColr = refMtbColt != null ? refMtbColt.getMtbColr().get(0) : null;
@@ -962,20 +957,20 @@ public class SpedizioneViewModel {
                                 .findFirst()
                                 .orElse(null);
 
-                        dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, scannedMtbColr, canPartitaMagBeChanged);
+                        dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, scannedMtbColr, canPartitaMagBeChanged, executeImmediately);
                     }
                 });
 
             } else {
-                dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, scannedMtbColrs.get(0), canPartitaMagBeChanged);
+                dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, scannedMtbColrs.get(0), canPartitaMagBeChanged, executeImmediately);
             }
 
         } else {
-            dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, null, canPartitaMagBeChanged);
+            dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, null, canPartitaMagBeChanged, executeImmediately);
         }
     }
 
-    private void dispatchOrdineRowOnPostBatchLotSelection(final PickingObjectDTO pickingObjectDTO, MtbColt refMtbColt, MtbColr refMtbColr, MtbColr scannedMtbColr, boolean canPartitaMagBeChanged) {
+    private void dispatchOrdineRowOnPostBatchLotSelection(final PickingObjectDTO pickingObjectDTO, MtbColt refMtbColt, MtbColr refMtbColr, MtbColr scannedMtbColr, boolean canPartitaMagBeChanged, boolean executeImmediately) {
         BigDecimal totalQtaOrd = pickingObjectDTO.getSitArtOrdDTO().getQtaOrd();
         BigDecimal totalNumCnfOrd = pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd();
         BigDecimal qtaCnfOrd = pickingObjectDTO.getSitArtOrdDTO().getQtaCnfOrd();
@@ -1104,10 +1099,14 @@ public class SpedizioneViewModel {
         BigDecimal initialQtaCnf = mUseColliPedana ? pickingObjectDTO.getMtbAart().getQtaCnf() : mUseQtaOrd ? qtaCnfDaPrelevare : null;
         BigDecimal initialQtaTot = mUseColliPedana ? initialNumCnf.multiply(initialQtaCnf) : mUseQtaOrd ? qtaColDaPrelevare : null;
 
-        MtbColt finalRefMtbColt = refMtbColt;
-        this.onItemDispatched(pickingObjectDTO, pickingObjectDTO.getMtbAart(), initialNumCnf, initialQtaCnf, initialQtaTot, qtaDaEvadere, numCnfDaEvadere, qtaCnfDaEvadere, qtaColDaPrelevare, numCnfDaPrelevare, qtaCnfDaPrelevare, totalQtaAvailable, totalNumCnfAvailable, qtaCnfAvailable, partitaMag, dataScad, mCanOverflowOrderQuantity, canPartitaMagBeChanged, (pickedQuantityDTO, shouldCloseLU) -> {
-            this.saveNewRow(pickingObjectDTO, finalRefMtbColt, pickedQuantityDTO.getNumCnf(), pickedQuantityDTO.getQtaCnf(), pickedQuantityDTO.getQtaTot(), pickedQuantityDTO.getPartitaMag(), pickedQuantityDTO.getDataScad(), shouldCloseLU);
-        });
+        if (executeImmediately) {
+            this.saveNewRow(pickingObjectDTO, refMtbColt, numCnfDaPrelevare, qtaCnfDaPrelevare, qtaColDaPrelevare, partitaMag, dataScad, false, false);
+        } else {
+            MtbColt finalRefMtbColt = refMtbColt;
+            this.onItemDispatched(pickingObjectDTO, pickingObjectDTO.getMtbAart(), initialNumCnf, initialQtaCnf, initialQtaTot, qtaDaEvadere, numCnfDaEvadere, qtaCnfDaEvadere, qtaColDaPrelevare, numCnfDaPrelevare, qtaCnfDaPrelevare, totalQtaAvailable, totalNumCnfAvailable, qtaCnfAvailable, partitaMag, dataScad, mCanOverflowOrderQuantity, canPartitaMagBeChanged, (pickedQuantityDTO, shouldCloseLU) -> {
+                this.saveNewRow(pickingObjectDTO, finalRefMtbColt, pickedQuantityDTO.getNumCnf(), pickedQuantityDTO.getQtaCnf(), pickedQuantityDTO.getQtaTot(), pickedQuantityDTO.getPartitaMag(), pickedQuantityDTO.getDataScad(), shouldCloseLU, true);
+            });
+        }
     }
 
     public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canOverflowOrderQuantity, boolean canPartitaMagBeChanged, RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
@@ -1230,7 +1229,7 @@ public class SpedizioneViewModel {
 
         MtbColt finalRefMtbColt = refMtbColt;
         this.onItemDispatched(pickingObjectDTO, pickingObjectDTO.getMtbAart(), initialNumCnf, initialQtaCnf, initialQtaTot, null, null, null, qtaColDaPrelevare, numCnfDaPrelevare, qtaCnfDaPrelevare, totalQtaAvailable, totalNumCnfAvailable, qtaCnfAvailable, partitaMag, dataScad, mCanOverflowOrderQuantity, true, (pickedQuantityDTO, shouldCloseLU) -> {
-            this.saveNewRow(pickingObjectDTO, finalRefMtbColt, pickedQuantityDTO.getNumCnf(), pickedQuantityDTO.getQtaCnf(), pickedQuantityDTO.getQtaTot(), pickedQuantityDTO.getPartitaMag(), pickedQuantityDTO.getDataScad(), shouldCloseLU);
+            this.saveNewRow(pickingObjectDTO, finalRefMtbColt, pickedQuantityDTO.getNumCnf(), pickedQuantityDTO.getQtaCnf(), pickedQuantityDTO.getQtaTot(), pickedQuantityDTO.getPartitaMag(), pickedQuantityDTO.getDataScad(), shouldCloseLU, true);
         });
     }
 
@@ -1391,7 +1390,7 @@ public class SpedizioneViewModel {
         }, this::sendError);
     }
 
-    public void saveNewRow(PickingObjectDTO pickingObjectDTO, MtbColt refMtbColt, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
+    public void saveNewRow(PickingObjectDTO pickingObjectDTO, MtbColt refMtbColt, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU, boolean removeFilters) {
         this.sendOnLoadingStarted();
 
         //TODO: Al posto di prelevare la prima riga bisognerebbe controllare se c'è ne una che corrisponde con la partita richiesta
@@ -1453,7 +1452,7 @@ public class SpedizioneViewModel {
 
                 if (refMtbColt != null) {
 
-                    MtbColr originalRefMtbColr = refMtbColt.getMtbColr() != null && refMtbColt.getMtbColr().size() > 0 ? refMtbColt.getMtbColr().get(0) : null;
+                    MtbColr originalRefMtbColr = refMtbColt.getMtbColr() != null && !refMtbColt.getMtbColr().isEmpty() ? refMtbColt.getMtbColr().get(0) : null;
 
                     if (originalRefMtbColr != null) {
                         refMtbColr.setId(originalRefMtbColr.getId());
@@ -1468,7 +1467,11 @@ public class SpedizioneViewModel {
             }
 
             //Chiamato removeListFilter perché cosi mi cancella tutti i dati di pick temporanei
-            resetMatchedRows();
+            if (removeFilters)
+                resetMatchedRows();
+            else
+                //Refresh della lista forzato
+                this.mPickingList.postValue(this.mPickingList.getValue());
 
             this.sendOnRowSaved();
             this.sendOnLoadingEnded();
@@ -1620,6 +1623,23 @@ public class SpedizioneViewModel {
                 //.setPrintSSCC(shouldPrint)
                 .setOrderCodMdep(codMdep);
 
+        if (this.mColliScaricoRESTConsumer instanceof ColliLavorazioneRESTConsumer && !mIsOrdTrasf) {
+            closeUDSRequestDto.setCriterioDistribuzione(CriterioDistribuzioneEnum.FASE);
+
+            var codAnag = mTestateOrdini.stream()
+                    .map(OrdineUscitaInevasoDTO::getCodAnagOrd)
+                    .filter(Objects::nonNull)
+                    .distinct()
+                    .findFirst()
+                    .get();
+            closeUDSRequestDto.setDocumentCodAnag(codAnag);
+
+            closeUDSRequestDto
+                    .setCreateDocument(SettingsManager.iDB().isProduzioneGeneraDocScar())
+                    .setDocumentCodDtip(SettingsManager.iDB().getProduzioneCodDtipScar());
+
+        }
+
         this.mColliScaricoRESTConsumer.closeUDS(closeUDSRequestDto, closeResponse -> {
             onComplete.run(closeResponse.getGeneratedMtbColts());
         }, this::sendError);
@@ -2017,7 +2037,8 @@ public class SpedizioneViewModel {
     void createDocs() {
         var loadCollidto = new LoadColliDTO();
 
-        var codAnag = mTestateOrdini.stream().map(OrdineUscitaInevasoDTO::getCodAnagOrd)
+        var codAnag = mTestateOrdini.stream()
+                .map(OrdineUscitaInevasoDTO::getCodAnagOrd)
                 .filter(Objects::nonNull)
                 .distinct()
                 .findFirst()
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
index b466f34c..88e2bab4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
@@ -25,7 +25,7 @@ import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.OnSingleClickListener;
-import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
+import it.integry.integrywmsnative.core.expansion.RunnableArgssss;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
@@ -43,7 +43,8 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
     private final FragmentManager mFragmentManager;
     private final List<SpedizioneListModel> mDataset = new ArrayList<>();
 
-    private RunnableArgsss<PickingObjectDTO, MtbColt, MtbColr> mOnItemClicked;
+    private RunnableArgssss<PickingObjectDTO, MtbColt, MtbColr, Boolean> mOnItemClicked;
+    private RunnableArgssss<PickingObjectDTO, MtbColt, MtbColr, Boolean> mOnItemLongClicked;
 
     static class SubheaderHolder extends RecyclerView.ViewHolder {
 
@@ -83,10 +84,14 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
         });
     }
 
-    public void setOnItemClicked(RunnableArgsss<PickingObjectDTO, MtbColt, MtbColr> onItemClicked) {
+    public void setOnItemClicked(RunnableArgssss<PickingObjectDTO, MtbColt, MtbColr, Boolean> onItemClicked) {
         this.mOnItemClicked = onItemClicked;
     }
 
+    public void setOnItemLongClicked(RunnableArgssss<PickingObjectDTO, MtbColt, MtbColr, Boolean> onItemLongClicked) {
+        this.mOnItemLongClicked = onItemLongClicked;
+    }
+
 
     @Override
     public SubheaderHolder onCreateSubheaderViewHolder(ViewGroup parent, int viewType) {
@@ -179,7 +184,13 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
 
         holder.mBinding.getRoot().setOnClickListener(v -> {
             if (this.mOnItemClicked != null)
-                this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel(), pickingObjectDTO.getSourceMtbColt(), pickingObjectDTO.getSourceMtbColr());
+                this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel(), pickingObjectDTO.getSourceMtbColt(), pickingObjectDTO.getSourceMtbColr(), false);
+        });
+
+        holder.mBinding.getRoot().setOnLongClickListener(v -> {
+            if (this.mOnItemLongClicked != null)
+                this.mOnItemLongClicked.run(pickingObjectDTO.getOriginalModel(), pickingObjectDTO.getSourceMtbColt(), pickingObjectDTO.getSourceMtbColr(), true);
+            return true;
         });
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java
index 8edf5632..e2919259 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java
@@ -239,7 +239,8 @@ public class VersamentoMerceViewModel {
                 this.mColliMagazzinoRESTConsumer.spostaArtsTraUL(
                         clonedSourceTestata,
                         destMtbColt,
-                        () -> {
+                        false,
+                        (generatedMtbColrs) -> {
                             this.sendOnDataSaved();
                             onComplete.run();
                         },
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownAdapter.java b/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownAdapter.java
index 54f9078d..100d3a04 100644
--- a/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownAdapter.java
@@ -11,23 +11,25 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.databinding.ArrayAdapterTwoLinesItemBinding;
 
 public class SimpleAutoCompleteTwoLinesDropdownAdapter<T> extends ArrayAdapter<SimpleAutoCompleteTwoLinesDropdownListModel<T>> {
 
     private List<SimpleAutoCompleteTwoLinesDropdownListModel<T>> mObjects;
+    private RunnableArgs<String> onTextChanged;
 
     public SimpleAutoCompleteTwoLinesDropdownAdapter(@NonNull Context context, int resource) {
         super(context, resource);
     }
 
-    public SimpleAutoCompleteTwoLinesDropdownAdapter(@NonNull Context context, @NonNull SimpleAutoCompleteTwoLinesDropdownListModel<T>[] objects) {
-        super(context, R.layout.array_adapter_two_lines_item, objects);
-        mObjects = Arrays.asList(objects);
+    public SimpleAutoCompleteTwoLinesDropdownAdapter(@NonNull Context context, int resource, @NonNull List<SimpleAutoCompleteTwoLinesDropdownListModel<T>> objects) {
+        super(context, resource, objects);
+        mObjects = objects;
     }
 
     public SimpleAutoCompleteTwoLinesDropdownAdapter(@NonNull Context context, @NonNull List<SimpleAutoCompleteTwoLinesDropdownListModel<T>> objects) {
@@ -35,10 +37,15 @@ public class SimpleAutoCompleteTwoLinesDropdownAdapter<T> extends ArrayAdapter<S
         mObjects = objects;
     }
 
+    public SimpleAutoCompleteTwoLinesDropdownAdapter<T> setOnTextChanged(RunnableArgs<String> onTextChanged) {
+        this.onTextChanged = onTextChanged;
+        return this;
+    }
+
     @NonNull
     @Override
     public Filter getFilter() {
-        return new StringFilter(mObjects);
+        return new StringFilter(mObjects, this.onTextChanged);
     }
 
 
@@ -67,9 +74,12 @@ public class SimpleAutoCompleteTwoLinesDropdownAdapter<T> extends ArrayAdapter<S
     private class StringFilter extends Filter {
 
         private ArrayList<SimpleAutoCompleteTwoLinesDropdownListModel<T>> sourceObjects;
+        private final RunnableArgs<String> onTextChanged;
 
-        public StringFilter(List<SimpleAutoCompleteTwoLinesDropdownListModel<T>> objects) {
-            if(objects == null) return;
+        public StringFilter(List<SimpleAutoCompleteTwoLinesDropdownListModel<T>> objects, RunnableArgs<String> onTextChanged) {
+            this.onTextChanged = onTextChanged;
+
+            if (objects == null) return;
             sourceObjects = new ArrayList<>();
 
             synchronized (this) {
@@ -79,17 +89,16 @@ public class SimpleAutoCompleteTwoLinesDropdownAdapter<T> extends ArrayAdapter<S
 
         @Override
         protected FilterResults performFiltering(CharSequence chars) {
+            if(this.onTextChanged != null) this.onTextChanged.run(chars.toString());
+
             String filterSeq = chars.toString().toLowerCase();
             FilterResults result = new FilterResults();
             if (!filterSeq.isEmpty()) {
-                ArrayList<SimpleAutoCompleteTwoLinesDropdownListModel<T>> filter = new ArrayList<>();
+                List<SimpleAutoCompleteTwoLinesDropdownListModel<T>> filter = sourceObjects.parallelStream()
+                        .filter(x -> x.getDescription().toLowerCase().contains(filterSeq) ||
+                                x.getTitle().toLowerCase().contains(filterSeq))
+                        .collect(Collectors.toList());
 
-                for (SimpleAutoCompleteTwoLinesDropdownListModel<T> object : sourceObjects) {
-                    // the filtering itself:
-                    if (object.getDescription().toLowerCase().contains(filterSeq) ||
-                            object.getTitle().toLowerCase().contains(filterSeq))
-                        filter.add(object);
-                }
 
                 result.count = filter.size();
                 result.values = filter;
@@ -108,13 +117,11 @@ public class SimpleAutoCompleteTwoLinesDropdownAdapter<T> extends ArrayAdapter<S
         protected void publishResults(CharSequence constraint,
                                       FilterResults results) {
             // NOTE: this function is *always* called from the UI thread.
-            if(constraint != null && constraint.length() > 2) {
+            if (constraint != null && constraint.length() > 2) {
                 ArrayList<SimpleAutoCompleteTwoLinesDropdownListModel<T>> filtered = (ArrayList<SimpleAutoCompleteTwoLinesDropdownListModel<T>>) results.values;
-                notifyDataSetChanged();
                 clear();
-                for (int i = 0, l = filtered.size(); i < l; i++)
-                    add(filtered.get(i));
-                notifyDataSetInvalidated();
+                addAll(filtered);
+                notifyDataSetChanged();
             }
         }
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownListModel.java b/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownListModel.java
index 9b3bbe4f..3500208d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownListModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownListModel.java
@@ -33,4 +33,9 @@ public class SimpleAutoCompleteTwoLinesDropdownListModel<T> {
         this.originalModel = originalModel;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return getTitle() + " - " + getDescription();
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Cliente_ArrayAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Cliente_ArrayAdapter.java
index 6d7f1218..26ada95a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Cliente_ArrayAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Cliente_ArrayAdapter.java
@@ -37,7 +37,7 @@ public class DialogAskCliente_Page1_Cliente_ArrayAdapter extends ArrayAdapter<Di
     public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
         View listItem = convertView;
         if(listItem == null) {
-            listItem = LayoutInflater.from(mContext).inflate(R.layout.dropdown_simple_item_w_subtitle, parent, false);
+            listItem = LayoutInflater.from(mContext).inflate(R.layout.dropdown_simple_item_w_subtitle_bottom, parent, false);
         }
 
         if(position < mDataset.size()) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaComponent.java
new file mode 100644
index 00000000..3cf74725
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.ask_commessa;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogAskCommessaComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogAskCommessaComponent create();
+    }
+
+    void inject(DialogAskCommessaView dialogAskCommessaView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaModule.java
new file mode 100644
index 00000000..fcad225f
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaModule.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.view.dialogs.ask_commessa;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+
+@Module(subcomponents = DialogAskCommessaComponent.class)
+public class DialogAskCommessaModule {
+
+    @Provides
+    DialogAskCommessaViewModel providesDialogAskCommessaViewModel(SystemRESTConsumer systemRESTConsumer) {
+        return new DialogAskCommessaViewModel(systemRESTConsumer);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaView.java
new file mode 100644
index 00000000..6224038c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaView.java
@@ -0,0 +1,168 @@
+package it.integry.integrywmsnative.view.dialogs.ask_commessa;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.snackbar.Snackbar;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.di.TextWatcherAdapter;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.JtbComt;
+import it.integry.integrywmsnative.databinding.DialogAskCommessaBinding;
+import it.integry.integrywmsnative.ui.adapter.SimpleAutoCompleteTwoLinesDropdownAdapter;
+import it.integry.integrywmsnative.ui.adapter.SimpleAutoCompleteTwoLinesDropdownListModel;
+
+public class DialogAskCommessaView extends BaseDialogFragment implements DialogAskCommessaViewModel.Listener {
+
+    @Inject
+    DialogAskCommessaViewModel mViewModel;
+
+    private final RunnableArgs<JtbComt> onComplete;
+    private final Runnable onAbort;
+
+    private DialogAskCommessaBinding mBindings;
+    private Context mContext;
+
+    private int mBarcodeScannerIstanceID;
+
+    private JtbComt selectedJtbComt;
+
+    //Pass here all external parameters
+    public static DialogAskCommessaView newInstance(RunnableArgs<JtbComt> onComplete, Runnable onAbort) {
+        return new DialogAskCommessaView(onComplete, onAbort);
+    }
+
+    private DialogAskCommessaView(RunnableArgs<JtbComt> onComplete, Runnable onAbort) {
+        super();
+
+        this.onComplete = onComplete;
+        this.onAbort = onAbort;
+
+        MainApplication.appComponent
+                .dialogAskCommessaComponent()
+                .create()
+                .inject(this);
+    }
+
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogAskCommessaBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+
+        setCancelable(false);
+
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .setNeutralButton(R.string.action_close, null)
+                .setPositiveButton(R.string.confirm, (dialog, which) -> {
+                    //Volutamente vuoto
+                })
+                .create();
+
+
+        alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+        return alertDialog;
+    }
+
+    @Override
+    public void onShow(DialogInterface dialogInterface) {
+        super.onShow(dialogInterface);
+
+        var alertDialog = ((AlertDialog) dialogInterface);
+
+        var positiveButton = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE);
+        positiveButton.setOnClickListener(view -> {
+            if (selectedJtbComt != null) {
+                this.onComplete.run(this.selectedJtbComt);
+                alertDialog.dismiss();
+            } else {
+                Snackbar.make(mContext, mBindings.getRoot(), "Seleziona una commessa prima di procedere", Snackbar.LENGTH_LONG).show();
+            }
+        });
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        super.onDismiss(dialog);
+
+        BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
+    }
+
+    @Override
+    public void onInit(DialogInterface dialogInterface) {
+        this.initBarcode();
+
+        this.mViewModel.setListener(this);
+        this.mViewModel.init();
+    }
+
+    private void initBarcode() {
+        mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessful(onScanSuccessful)
+                .setOnScanFailed(this::onError));
+
+        BarcodeManager.enable();
+    }
+
+    private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
+        BarcodeManager.disable();
+//        this.mViewModel.processBarcodeDTO(data, BarcodeManager::enable);
+    };
+
+    @Override
+    public void onCommesseLoaded(List<JtbComt> dataList) {
+        requireActivity().runOnUiThread(() -> {
+
+            var listModel = dataList.stream()
+                    .map(x -> new SimpleAutoCompleteTwoLinesDropdownListModel<JtbComt>()
+                            .setTitle(x.getCodJcom())
+                            .setDescription(x.getDescrizione())
+                            .setOriginalModel(x))
+                    .collect(Collectors.toList());
+
+
+            var adapter = new SimpleAutoCompleteTwoLinesDropdownAdapter<>(requireActivity(), listModel);
+            mBindings.dropdownCommessa.setAdapter(adapter);
+
+            mBindings.inputCliente.getEditText().addTextChangedListener(new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) {
+                    selectedJtbComt = null;
+                }
+            });
+
+            mBindings.dropdownCommessa.setOnItemClickListener((parent, view, position, id) -> {
+                selectedJtbComt = Objects.requireNonNull(adapter.getItem(position)).getOriginalModel();
+            });
+
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaViewModel.java
new file mode 100644
index 00000000..09fefc23
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_commessa/DialogAskCommessaViewModel.java
@@ -0,0 +1,69 @@
+package it.integry.integrywmsnative.view.dialogs.ask_commessa;
+
+import com.google.common.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.model.JtbComt;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+
+public class DialogAskCommessaViewModel {
+
+    private final SystemRESTConsumer systemRESTConsumer;
+
+    private Listener mListener;
+
+    @Inject
+    public DialogAskCommessaViewModel(SystemRESTConsumer systemRESTConsumer) {
+        this.systemRESTConsumer = systemRESTConsumer;
+    }
+
+
+
+    public void init() {
+        Type jtbComtListType = new TypeToken<ArrayList<JtbComt>>() {}.getType();
+
+        this.systemRESTConsumer.<List<JtbComt>>processSql("SELECT * " +
+                "FROM jtb_comt " +
+                "WHERE ISNULL(stato_commessa, '') <> 'CHIUSA'", jtbComtListType, data -> {
+
+            this.sendOnCommesseLoaded(data);
+
+        }, this::sendError);
+    }
+
+
+
+
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
+    }
+
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
+    }
+
+    private void sendOnCommesseLoaded(List<JtbComt> commesseList) {
+        if (this.mListener != null) mListener.onCommesseLoaded(commesseList);
+    }
+
+    public DialogAskCommessaViewModel setListener(Listener listener) {
+        this.mListener = listener;
+        return this;
+    }
+
+    interface Listener extends ILoadingListener {
+        void onCommesseLoaded(List<JtbComt> dataList);
+
+        void onError(Exception ex);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java
index c5e85b6e..03e949d1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java
@@ -6,9 +6,9 @@ import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
 
-import com.annimon.stream.Stream;
-
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import it.integry.integrywmsnative.core.model.MtbTCol;
 
@@ -20,10 +20,12 @@ public class DialogInputLUProdTipoColloAdapter extends ArrayAdapter<DialogInputL
         super(context, resource);
 
         inputData.observeForever(data -> {
-             mDataset = Stream.of(data)
-                    .map(x -> new DialogInputLUProdTipoColloListModel()
-                            .setOriginalModel(x))
-                    .toList();
+            if (data != null)
+                mDataset = data.stream()
+                        .map(x -> new DialogInputLUProdTipoColloListModel()
+                                .setOriginalModel(x))
+                        .collect(Collectors.toList());
+            else mDataset = new ArrayList<>();
 
             clear();
             addAll(mDataset);
diff --git a/app/src/main/res/drawable/ic_puzzle.xml b/app/src/main/res/drawable/ic_puzzle.xml
new file mode 100644
index 00000000..e275ad09
--- /dev/null
+++ b/app/src/main/res/drawable/ic_puzzle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.5,0C10.119,0 9,1.119 9,2.5L9,4L5,4C3.895,4 3,4.895 3,6L3,9C3,9.552 3.448,10 4,10L4.357,10C5.665,10 6.855,10.941 6.986,12.242C7.136,13.739 5.966,15 4.5,15L4,15C3.448,15 3,15.448 3,16L3,19C3,20.105 3.895,21 5,21L8,21C8.552,21 9,20.552 9,20L9,19.643C9,18.335 9.941,17.145 11.242,17.014C12.739,16.864 14,18.034 14,19.5L14,20C14,20.552 14.448,21 15,21L18,21C19.105,21 20,20.105 20,19L20,15L21.5,15C22.881,15 24,13.881 24,12.5C24,11.119 22.881,10 21.5,10L20,10L20,6C20,4.895 19.105,4 18,4L14,4L14,2.5C14,1.119 12.881,0 11.5,0z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_ask_commessa.xml b/app/src/main/res/layout/dialog_ask_commessa.xml
new file mode 100644
index 00000000..482543f4
--- /dev/null
+++ b/app/src/main/res/layout/dialog_ask_commessa.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="0dp">
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="16dp"
+            android:paddingVertical="16dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_error_white_24dp"
+                app:tint="?colorPrimary" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title_text"
+                style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_marginBottom="16dp"
+                android:text="@string/job" />
+
+
+
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/input_cliente"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionDone"
+                android:hint="@string/job">
+
+                <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                    android:id="@+id/dropdown_commessa"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:imeOptions="actionDone" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/MaterialAlertDialog.Material3.Body.Text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginVertical="12dp"
+                android:gravity="center_horizontal"
+                android:text="OPPURE"
+                android:textStyle="bold" />
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_marginHorizontal="16dp">
+
+
+
+                <com.google.android.material.progressindicator.CircularProgressIndicator
+                    android:id="@+id/progressBar"
+                    style="?attr/circularProgressIndicatorStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:indeterminate="true"
+                    app:trackCornerRadius="4dp"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="16sp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="12dp"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_horizontal"
+                    style="@style/TextAppearance.Material3.BodyMedium"
+                    android:text="Scansiona il codice a barre di una commessa"/>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+    </androidx.cardview.widget.CardView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dropdown_simple_item_w_subtitle.xml b/app/src/main/res/layout/dropdown_simple_item_w_subtitle_bottom.xml
similarity index 100%
rename from app/src/main/res/layout/dropdown_simple_item_w_subtitle.xml
rename to app/src/main/res/layout/dropdown_simple_item_w_subtitle_bottom.xml
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
index 2679d28e..339b5918 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
@@ -7,6 +7,7 @@
     <data>
 
         <import type="android.view.View" />
+        <import type="it.integry.integrywmsnative.R" />
 
         <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
 
@@ -301,8 +302,8 @@
                         <androidx.appcompat.widget.LinearLayoutCompat
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:layout_weight="1">
+                            android:layout_weight="1"
+                            android:orientation="vertical">
 
                             <TextView
                                 style="@style/TextViewMaterial.Dialog.SupportingText"
@@ -371,8 +372,8 @@
                             <androidx.appcompat.widget.LinearLayoutCompat
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:orientation="horizontal"
-                                android:layout_gravity="end">
+                                android:layout_gravity="end"
+                                android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatImageView
                                     android:layout_width="24dp"
@@ -436,25 +437,26 @@
                                     android:layout_height="24dp"
                                     android:layout_gravity="center_vertical"
                                     android:layout_margin="8dp"
-                                    android:src="@drawable/ic_weight_kg"
+                                    android:src="@{view.untMisIcon}"
+                                    tools:src="@drawable/ic_weight_kg"
                                     android:tint="@color/gray_500" />
 
                                 <androidx.appcompat.widget.LinearLayoutCompat
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="center_vertical"
-                                    android:visibility="@{view.isOrderColli ? View.GONE  :View.VISIBLE}"
                                     android:gravity="start"
-                                    android:orientation="vertical">
+                                    android:orientation="vertical"
+                                    android:visibility="@{view.isOrderColli ? View.GONE : View.VISIBLE}">
 
                                     <androidx.appcompat.widget.AppCompatTextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        tools:text="KG"
                                         android:text="@{view.currentOrder.untOrd}"
                                         android:textAllCaps="true"
                                         android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                        android:textStyle="bold" />
+                                        android:textStyle="bold"
+                                        tools:text="KG" />
 
                                     <androidx.appcompat.widget.LinearLayoutCompat
                                         android:layout_width="wrap_content"
@@ -475,9 +477,9 @@
                                             android:layout_height="wrap_content"
                                             android:layout_marginStart="4dp"
                                             android:text="@{view.currentOrder.untOrd}"
-                                            tools:text="KG"
                                             android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                            android:textColor="@android:color/black" />
+                                            android:textColor="@android:color/black"
+                                            tools:text="KG" />
 
                                     </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -490,16 +492,16 @@
                         <androidx.appcompat.widget.LinearLayoutCompat
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:layout_weight="1">
+                            android:layout_weight="1"
+                            android:orientation="vertical">
 
                             <TextView
                                 style="@style/TextViewMaterial.Dialog.SupportingText"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
+                                android:gravity="end"
                                 android:text="Prodotto"
                                 android:textStyle="bold"
-                                android:gravity="end"
                                 tools:text="Prodotto" />
 
                             <androidx.appcompat.widget.LinearLayoutCompat
@@ -696,7 +698,8 @@
                                     android:layout_height="24dp"
                                     android:layout_gravity="center_vertical"
                                     android:layout_margin="8dp"
-                                    android:src="@drawable/ic_weight_kg"
+                                    android:src="@{view.untMisIcon}"
+                                    tools:src="@drawable/ic_weight_kg"
                                     android:tint="@color/gray_500" />
 
                             </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/prod_recupero_materiale_list_item.xml b/app/src/main/res/layout/prod_recupero_materiale_list_item.xml
index 8611989c..87c9bf05 100644
--- a/app/src/main/res/layout/prod_recupero_materiale_list_item.xml
+++ b/app/src/main/res/layout/prod_recupero_materiale_list_item.xml
@@ -10,7 +10,7 @@
         android:paddingVertical="8dp"
         android:paddingEnd="8dp">
 
-        <LinearLayout
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -34,37 +34,51 @@
                 android:textStyle="bold"
                 tools:text="22" />
 
-        </LinearLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
-        <LinearLayout
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <RelativeLayout
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical">
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/cod_mart"
-                    style="@style/TextAppearance.Material3.TitleMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:text="150101-040" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/partita_mag"
                     style="@style/TextAppearance.Material3.TitleSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignBottom="@id/cod_mart"
+                    android:gravity="center_vertical"
+                    android:layout_alignTop="@id/partita_mag_container"
+                    android:layout_alignBaseline="@id/partita_mag_container"
+                    tools:text="150101-040" />
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/partita_mag_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/green_200"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
                     android:layout_marginStart="4dp"
                     android:layout_marginEnd="6dp"
-                    android:layout_toStartOf="@id/right_content"
-                    android:layout_toEndOf="@id/cod_mart"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    tools:text="Lotto articolo" />
+                    android:layout_toEndOf="@id/cod_mart">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/partita_mag"
+                        style="@style/TextAppearance.Material3.TitleSmall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:singleLine="true"
+                        tools:text="Lotto articolo" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <RelativeLayout
                     android:id="@+id/right_content"
@@ -84,6 +98,7 @@
                             style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:textStyle="bold"
                             tools:text="27" />
 
                         <androidx.appcompat.widget.AppCompatTextView
@@ -92,6 +107,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="2dp"
+                            android:textStyle="bold"
                             tools:text="PZ" />
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -99,16 +115,49 @@
 
             </RelativeLayout>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/descrizione"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:singleLine="true"
-                style="@style/TextAppearance.Material3.BodySmall"
-                tools:text="Descrizione estesa articolo" />
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-        </LinearLayout>
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/descrizione"
+                    style="@style/TextAppearance.Material3.BodyMedium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:singleLine="false"
+                    android:maxLines="3"
+                    android:layout_marginTop="4dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_toStartOf="@id/commessa_container"
+                    tools:text="Descrizione estesa articolo" />
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/commessa_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/orange_300"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="6dp"
+                    android:layout_alignParentEnd="true">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/commessa"
+                        style="@style/TextAppearance.Material3.TitleSmall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:singleLine="true"
+                        tools:text="Commessa" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </RelativeLayout>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/values/custom_colors.xml b/app/src/main/res/values/custom_colors.xml
index 230b4313..77a8b4a3 100644
--- a/app/src/main/res/values/custom_colors.xml
+++ b/app/src/main/res/values/custom_colors.xml
@@ -93,6 +93,10 @@
     <color name="light_blue_800">#0277BD</color>
 
 
+    <color name="orange_200">#FFCC80</color>
+    <color name="orange_300">#FFB74D</color>
+    <color name="orange_400">#FFA726</color>
+    <color name="orange_500">#FF9800</color>
     <color name="orange_600_with_alpha">#88FB8C00</color>
     <color name="orange_600">#FB8C00</color>
     <color name="orange_700">#F57C00</color>
diff --git a/barcode_base_android_library/build.gradle b/barcode_base_android_library/build.gradle
index 71604865..00510dd7 100644
--- a/barcode_base_android_library/build.gradle
+++ b/barcode_base_android_library/build.gradle
@@ -32,5 +32,5 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
 }
diff --git a/build.gradle b/build.gradle
index d0fd349c..69f6067d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.20'
-        agp_version = '8.4.0'
+        agp_version = '8.6.0'
     }
 
     repositories {
@@ -13,12 +13,12 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$agp_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.4.1'
+        classpath 'com.google.gms:google-services:4.4.2'
 
         classpath 'com.google.firebase:perf-plugin:1.4.2'
 
         // Add the Firebase Crashlytics Gradle plugin.
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -40,7 +40,7 @@ allprojects {
 //    }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0b456dee..69d0c2a3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Feb 13 15:14:43 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/honeywellscannerlibrary/build.gradle b/honeywellscannerlibrary/build.gradle
index 56891476..0fab9d4d 100644
--- a/honeywellscannerlibrary/build.gradle
+++ b/honeywellscannerlibrary/build.gradle
@@ -33,6 +33,6 @@ dependencies {
 //    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 
     implementation project(":honeywellsdk")
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation project(path: ':barcode_base_android_library')
 }
diff --git a/keyobardemulatorscannerlibrary/build.gradle b/keyobardemulatorscannerlibrary/build.gradle
index 6b05d719..7137d320 100644
--- a/keyobardemulatorscannerlibrary/build.gradle
+++ b/keyobardemulatorscannerlibrary/build.gradle
@@ -32,6 +32,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation project(':barcode_base_android_library')
 }
diff --git a/pointmobilescannerlibrary/build.gradle b/pointmobilescannerlibrary/build.gradle
index b084ab91..d42abd4d 100644
--- a/pointmobilescannerlibrary/build.gradle
+++ b/pointmobilescannerlibrary/build.gradle
@@ -30,6 +30,6 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation project(':barcode_base_android_library')
 }
diff --git a/zebrascannerlibrary/build.gradle b/zebrascannerlibrary/build.gradle
index 7d952295..798703e1 100644
--- a/zebrascannerlibrary/build.gradle
+++ b/zebrascannerlibrary/build.gradle
@@ -32,7 +32,7 @@ dependencies {
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     testImplementation 'junit:junit:4.13.2'
     implementation project(path: ':barcode_base_android_library')
 }

From 4e95f4f9c9a38907c8aa72b99f183f95d6ba2351 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Mon, 16 Sep 2024 09:32:36 +0200
Subject: [PATCH 033/103] =?UTF-8?q?Aggiunto=20dialog=20per=20il=20suggerim?=
 =?UTF-8?q?ento=20dei=20lotti=20gi=C3=A0=20esistenti=20nei=20documenti=20i?=
 =?UTF-8?q?nterni?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MainApplicationComponent.java             |   4 +
 .../dto/RetrieveLottiDTO.java                 |  37 ++++++
 .../contab_doc_interni/dto/TipoDocDTO.java    |  10 ++
 .../edit_form/DocInterniEditFormActivity.java |  26 ++++
 .../DocInterniEditFormViewModel.java          |  12 +-
 .../DialogSelectLottiComponent.java           |  14 ++
 .../DialogSelectLottiItemListModel.java       |  54 ++++++++
 .../selectLotti/DialogSelectLottiModule.java  |  14 ++
 .../selectLotti/DialogSelectLottiView.java    | 123 ++++++++++++++++++
 .../DialogSelectLottiViewModel.java           |   5 +
 .../rest/DocInterniRESTConsumer.java          |  20 +++
 .../rest/DocInterniRESTConsumerService.java   |   8 ++
 .../main/res/layout/dialog_select_lotti.xml   |  43 ++++++
 .../dialog_select_lotti__item_model.xml       |  79 +++++++++++
 14 files changed, 448 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/RetrieveLottiDTO.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiComponent.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiItemListModel.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiModule.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiView.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiViewModel.java
 create mode 100644 app/src/main/res/layout/dialog_select_lotti.xml
 create mode 100644 app/src/main/res/layout/dialog_select_lotti__item_model.xml

diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
index 40a6eb59..13acc45b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
@@ -29,6 +29,8 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniE
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormModule;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsComponent;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti.DialogSelectLottiComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti.DialogSelectLottiModule;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleComponent;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleModule;
 import it.integry.integrywmsnative.gest.inventario.ElencoInventariComponent;
@@ -186,6 +188,7 @@ import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracc
         DialogSelectDocInfoModule.class,
         DocInterniEditFormModule.class,
         DialogSelectDocRowsModule.class,
+        DialogSelectLottiModule.class,
         DialogAskClienteModule.class,
         DialogEditArticoloModule.class,
         DialogPrintOrderSSCCListModule.class,
@@ -332,6 +335,7 @@ public interface MainApplicationComponent {
     DialogInfoSituazioneArticoloComponent.Factory dialogInfoSituazioneArticoloComponent();
 
     DialogSelectDocRowsComponent.Factory dialogSelectDocRowsNewComponent();
+    DialogSelectLottiComponent.Factory dialogSelectLottiComponent();
 
     DialogSelectArtToOrderComponent.Factory dialogSelectArtToOrderNewComponent();
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/RetrieveLottiDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/RetrieveLottiDTO.java
new file mode 100644
index 00000000..48a72886
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/RetrieveLottiDTO.java
@@ -0,0 +1,37 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.dto;
+
+import java.util.Date;
+
+public class RetrieveLottiDTO {
+
+    private String codProd;
+    private String partitaMag;
+    private Date dataScad;
+
+    public String getCodProd() {
+        return codProd;
+    }
+
+    public RetrieveLottiDTO setCodProd(String codProd) {
+        this.codProd = codProd;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public RetrieveLottiDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public Date getDataScad() {
+        return dataScad;
+    }
+
+    public RetrieveLottiDTO setDataScad(Date dataScad) {
+        this.dataScad = dataScad;
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/TipoDocDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/TipoDocDTO.java
index 9bdc17a5..e039c42e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/TipoDocDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/TipoDocDTO.java
@@ -8,6 +8,7 @@ public class TipoDocDTO {
     private String gestioneDoc;
     private boolean flagChkTracciabilita;
     private boolean requireNote = false;
+    private boolean suggestLotti;
 
     public String getCodDtip() {
         return codDtip;
@@ -62,4 +63,13 @@ public class TipoDocDTO {
         this.flagChkTracciabilita = flagChkTracciabilita;
         return this;
     }
+
+    public boolean isSuggestLotti() {
+        return suggestLotti;
+    }
+
+    public TipoDocDTO setSuggestLotti(boolean suggestLotti) {
+        this.suggestLotti = suggestLotti;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
index df254bd2..818c5109 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
@@ -42,6 +42,8 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDT
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipoDocDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsItemListModel;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsView;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti.DialogSelectLottiItemListModel;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti.DialogSelectLottiView;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.ui.DocumentRowsListAdapter;
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalView;
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
@@ -302,6 +304,30 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
                 .setFlagDig(isUntMisDig ? "S" : "N");
         mtbAart.setMtbUntMis(Collections.singletonList(mtbUntMis));
 
+        if (this.viewModel.getTipoDoc().isSuggestLotti()) {
+            this.viewModel.retrieveLotti(row.getCodMart(), lotti -> {
+                var dataSet =
+                        Stream.of(lotti)
+                                .map(x -> new DialogSelectLottiItemListModel<>()
+                                        .setPartitaMag(x.getPartitaMag())
+                                        .setDataScad(UtilityDate.toLocalDate(x.getDataScad()))
+                                        .setOriginalModel(x)
+                                )
+                                .toList();
+
+                DialogSelectLottiView.newInstance(dataSet, data -> {
+                    row.setPartitaMag(data.getPartitaMag());
+                    row.setDataScad(data.getDataScad());
+
+                    openInputQuantity(mtbAart, row, flagTracciabilita);
+                }, () -> {}).show(this.getSupportFragmentManager(), "dialogSelectLotti");;
+            });
+        } else {
+            openInputQuantity(mtbAart, row, flagTracciabilita);
+        }
+    }
+
+    private void openInputQuantity(MtbAart mtbAart, SqlMtbColr row, boolean flagTracciabilita) {
         DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
                 .setMtbAart(mtbAart)
                 .setInitialNumCnf(BigDecimal.valueOf(row.getNumCnf()))
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
index c8133c7e..5bc2e564 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
@@ -19,6 +19,7 @@ import it.integry.integrywmsnative.core.data_store.db.repository.MtbColrDataSour
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
 import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
 import it.integry.integrywmsnative.core.exception.NoResultFromCodMartException;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.rest.model.Ean128Model;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
@@ -32,6 +33,7 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.dto.CheckFornitoreDTO
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ColloDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.RetrieveLottiDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipoDocDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
@@ -126,7 +128,7 @@ public class DocInterniEditFormViewModel {
     }
 
     public void loadArticoloByCodMartOrBarcode(String codMart) {
-        if(productsList == null) {
+        if (productsList == null) {
             this.sendError(new NoResultFromCodMartException(codMart));
             return;
         }
@@ -372,6 +374,10 @@ public class DocInterniEditFormViewModel {
         }
     }
 
+    public void retrieveLotti(String codProd, RunnableArgs<List<RetrieveLottiDTO>> onComplete) {
+        docInterniRESTConsumer.retrieveLotti(codProd, onComplete, this::sendError);
+    }
+
     public void deleteRow(SqlMtbColr sqlMtbColr) {
         mtbColrRepository.delete(sqlMtbColr, this::fetchDocumentRows, this::sendError);
     }
@@ -397,6 +403,10 @@ public class DocInterniEditFormViewModel {
         return this;
     }
 
+    public TipoDocDTO getTipoDoc() {
+        return tipoDoc;
+    }
+
     public boolean isNotesMandatory() {
         return this.tipoDoc != null && this.tipoDoc.isRequireNote();
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiComponent.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiComponent.java
new file mode 100644
index 00000000..a9fba546
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogSelectLottiComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogSelectLottiComponent create();
+    }
+
+    void inject(DialogSelectLottiView dialogSelectLottiView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiItemListModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiItemListModel.java
new file mode 100644
index 00000000..30c23c15
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiItemListModel.java
@@ -0,0 +1,54 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti;
+
+import java.time.LocalDate;
+
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class DialogSelectLottiItemListModel<T> {
+
+    private String partitaMag;
+    private LocalDate dataScad;
+    private T originalModel;
+    private BindableBoolean checked = new BindableBoolean(false);
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public DialogSelectLottiItemListModel<T> setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public LocalDate getDataScad() {
+        return dataScad;
+    }
+
+    public String getDataScadText() {
+        return UtilityDate.formatDate(this.dataScad, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+    }
+
+    public DialogSelectLottiItemListModel<T> setDataScad(LocalDate dataScad) {
+        this.dataScad = dataScad;
+        return this;
+    }
+
+    public T getOriginalModel() {
+        return originalModel;
+    }
+
+    public DialogSelectLottiItemListModel<T> setOriginalModel(T originalModel) {
+        this.originalModel = originalModel;
+        return this;
+    }
+
+    public BindableBoolean getChecked() {
+        return checked;
+    }
+
+    public DialogSelectLottiItemListModel<T> setChecked(BindableBoolean checked) {
+        this.checked = checked;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiModule.java
new file mode 100644
index 00000000..f66deab7
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogSelectLottiComponent.class)
+public class DialogSelectLottiModule {
+
+    @Provides
+    DialogSelectLottiViewModel providesDialogSelectLottiViewModel() {
+        return new DialogSelectLottiViewModel();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiView.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiView.java
new file mode 100644
index 00000000..18a4c9ff
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiView.java
@@ -0,0 +1,123 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.annimon.stream.Stream;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.ravikoradiya.liveadapter.LiveAdapter;
+import com.ravikoradiya.liveadapter.Type;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.BR;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.databinding.DialogSelectLottiBinding;
+import it.integry.integrywmsnative.databinding.DialogSelectLottiItemModelBinding;
+
+/**
+ * @noinspection rawtypes
+ */
+public class DialogSelectLottiView extends BaseDialogFragment {
+    @Inject
+    DialogSelectLottiViewModel mViewModel;
+
+    private DialogSelectLottiBinding mBindings;
+    private Context mContext;
+
+    private final List<DialogSelectLottiItemListModel<Object>> listLotti;
+    private final RunnableArgs<DialogSelectLottiItemListModel> onConfirm;
+    private final Runnable onAbort;
+
+    public static DialogSelectLottiView newInstance(List<DialogSelectLottiItemListModel<Object>> listLotti,
+                                                    RunnableArgs<DialogSelectLottiItemListModel> onConfirm,
+                                                    Runnable onAbort) {
+        return new DialogSelectLottiView(listLotti, onConfirm, onAbort);
+    }
+
+    private DialogSelectLottiView(List<DialogSelectLottiItemListModel<Object>> listLotti,
+                                  RunnableArgs<DialogSelectLottiItemListModel> onConfirm,
+                                  Runnable onAbort) {
+        super();
+
+        this.listLotti = listLotti;
+        this.onConfirm = onConfirm;
+        this.onAbort = onAbort;
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogSelectLottiBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+
+        MainApplication.appComponent
+                .dialogSelectLottiComponent()
+                .create()
+                .inject(this);
+
+        setCancelable(false);
+
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .setPositiveButton(R.string.confirm, (dialog, which) -> {
+                    final DialogSelectLottiItemListModel<Object> selectedItem = Stream.of(listLotti)
+                            .filter(x -> x.getChecked().get())
+                            .findFirstOrElse(null);
+                    if (selectedItem != null)
+                        this.onConfirm.run(selectedItem);
+                })
+                .setNegativeButton(R.string.abort, (dialog, which) -> {
+                    if (this.onAbort != null) this.onAbort.run();
+                })
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+        return alertDialog;
+    }
+
+    @Override
+    public void onShow(DialogInterface dialogInterface) {
+        super.onShow(dialogInterface);
+
+        this.listLotti.get(0).getChecked().set(true);
+        this.initRecyclerView();
+    }
+
+    private void initRecyclerView() {
+        var itemType = new Type<DialogSelectLottiItemListModel, DialogSelectLottiItemModelBinding>(R.layout.dialog_select_lotti__item_model, BR.row);
+        itemType.areContentsTheSame(DialogSelectLottiItemListModel::equals);
+        itemType.onClick(x -> {
+            resetChecks();
+            x.getBinding().getRow().getChecked().set(true);
+
+            return null;
+        });
+
+        new LiveAdapter(listLotti)
+                .map(DialogSelectLottiItemListModel.class, itemType)
+                .into(this.mBindings.itemList);
+    }
+
+    private void resetChecks() {
+        for (var item : listLotti) {
+            item.getChecked().set(false);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiViewModel.java
new file mode 100644
index 00000000..04ec8824
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiViewModel.java
@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti;
+
+public class DialogSelectLottiViewModel {
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumer.java
index a51de127..d9bb33a5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumer.java
@@ -1,5 +1,9 @@
 package it.integry.integrywmsnative.gest.contab_doc_interni.rest;
 
+import androidx.annotation.NonNull;
+
+import java.util.List;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.exception.RestException;
@@ -9,6 +13,7 @@ import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.RetrieveLottiDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -38,6 +43,21 @@ public class DocInterniRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public void retrieveLotti(String codProd, RunnableArgs<List<RetrieveLottiDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        DocInterniRESTConsumerService service = RESTBuilder.getService(DocInterniRESTConsumerService.class);
+        service.retrieveLotti(codProd)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<List<RetrieveLottiDTO>>> call, @NonNull Response<ServiceRESTResponse<List<RetrieveLottiDTO>>> response) {
+                        analyzeAnswer(response, "retrieveLotti", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<List<RetrieveLottiDTO>>> call, @NonNull Throwable t) {
+                        onFailed.run(new RestException(t.getMessage()));
+                    }
+                });
+    }
 
     public void saveDoc(SaveDTO saveDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         magazzinoRESTConsumer.saveTerminalinoWMS(saveDTO, onComplete, onFailed);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java
index 03ac0727..5c2798bd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java
@@ -1,9 +1,14 @@
 package it.integry.integrywmsnative.gest.contab_doc_interni.rest;
 
+import java.util.List;
+
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.documento.RetrieveDocumentoArtsResponseDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.RetrieveLottiDTO;
 import retrofit2.Call;
 import retrofit2.http.GET;
+import retrofit2.http.Query;
 
 
 public interface DocInterniRESTConsumerService {
@@ -11,4 +16,7 @@ public interface DocInterniRESTConsumerService {
     @GET("getDocInterniSetup")
     Call<ServiceRESTResponse<DocInterniSetupDTO>> getSetupDocInterni();
 
+    @GET("wms/documento/retrieveLotti")
+    Call<ServiceRESTResponse<List<RetrieveLottiDTO>>> retrieveLotti(
+            @Query("codProd") String codProd);
 }
diff --git a/app/src/main/res/layout/dialog_select_lotti.xml b/app/src/main/res/layout/dialog_select_lotti.xml
new file mode 100644
index 00000000..6055b875
--- /dev/null
+++ b/app/src/main/res/layout/dialog_select_lotti.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="0dp">
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingVertical="16dp">
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title_text"
+                style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_marginBottom="16dp"
+                android:layout_marginHorizontal="16dp"
+                android:singleLine="false"
+                android:maxLines="2"
+                android:text="Seleziona lotto" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/item_list"
+                android:layout_width="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                android:layout_height="wrap_content"
+                tools:listitem="@layout/dialog_select_lotti__item_model"
+                tools:itemCount="5"/>
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+    </androidx.cardview.widget.CardView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_select_lotti__item_model.xml b/app/src/main/res/layout/dialog_select_lotti__item_model.xml
new file mode 100644
index 00000000..af077969
--- /dev/null
+++ b/app/src/main/res/layout/dialog_select_lotti__item_model.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="it.integry.integrywmsnative.R" />
+        <import type="android.view.View" />
+        <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+        <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+
+        <variable
+            name="row"
+            type="it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti.DialogSelectLottiItemListModel" />
+    </data>
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="4dp"
+        android:layout_marginVertical="2dp"
+        android:background="@drawable/bg_checked_layout"
+        android:onClick="@{() -> row.checked.toggle()}"
+        android:orientation="horizontal"
+        android:paddingStart="8dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="8dp"
+        app:backgroundTintResID="@{row.checked.get() ? R.color.bg_checked_layout : android.R.color.transparent}">
+
+        <androidx.appcompat.widget.AppCompatRadioButton
+            android:id="@+id/checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_gravity="center"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:clickable="false"
+            app:checked="@{row.checked}" />
+
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toEndOf="@id/checkbox"
+            android:layout_marginStart="4dp"
+            android:orientation="vertical">
+
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/partita_mag_label"
+                    style="@style/TextAppearance.Material3.BodyLarge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{row.partitaMag}"
+                    tools:text="PARTITA MAG" />
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{row.getDataScadText}"
+                    style="@style/TextAppearance.Material3.BodyMedium"
+                    android:textStyle="bold"
+                    android:layout_below="@id/partita_mag_label"
+                    tools:text="dd/MM/yyyy" />
+
+            </RelativeLayout>
+        </LinearLayout>
+    </RelativeLayout>
+</layout>
\ No newline at end of file

From 34e1ba8f9552cf5b9bc9220ebe99f250e7e73250 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 17 Sep 2024 18:33:22 +0200
Subject: [PATCH 034/103] -> v1.41.00 (448)

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

diff --git a/app/build.gradle b/app/build.gradle
index 898a04a4..3e33d4d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 447
-    def appVersionName = '1.40.30'
+    def appVersionCode = 448
+    def appVersionName = '1.41.00'
 
     signingConfigs {
         release {

From 03e2f4390bdc1ee8b5123a94ed0115e9782ef531 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 3 Oct 2024 16:41:40 +0200
Subject: [PATCH 035/103] Cambiato oggetto email log

---
 .../integrywmsnative/gest/settings/MainSettingsFragment.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
index 03c4044b..5590dbd4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
@@ -279,8 +279,8 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
                             var mailRequest = new MailRequestDTO()
                                     .setTo("developer@integry.it")
-                                    .setMsgText("Questo è una mail che contiene il log del WMS")
-                                    .setSubject("U vuemmeess")
+                                    .setMsgText("Questa è una mail contenente il log del WMS")
+                                    .setSubject("Internal WMS log")
                                     .setAttachments(attachmentDTOList);
 
 

From 6c8fd2518e3d82e41362202592b6ccd3805ea966 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 3 Oct 2024 16:43:10 +0200
Subject: [PATCH 036/103] Stili

---
 .idea/runConfigurations.xml                   |  13 +
 ...agment_prod_rientro_merce_order_detail.xml |  28 +-
 ...agment_prod_rientro_merce_order_detail.xml | 430 +-----------------
 app/src/main/res/values-it/strings.xml        |   1 +
 app/src/main/res/values/buttons_style.xml     |   1 +
 app/src/main/res/values/strings.xml           |   1 +
 6 files changed, 49 insertions(+), 425 deletions(-)
 create mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 00000000..931b96c3
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
index a67fc559..a4ba186a 100644
--- a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
@@ -142,6 +142,7 @@
                                     tools:text="Ordine #218" />
 
                                 <com.google.android.material.progressindicator.LinearProgressIndicator
+                                    style="?attr/linearProgressIndicatorStyle"
                                     android:id="@+id/order_progress"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
@@ -446,25 +447,26 @@
                                         android:layout_height="24dp"
                                         android:layout_gravity="center_vertical"
                                         android:layout_margin="8dp"
-                                        android:src="@drawable/ic_weight_kg"
+                                        android:src="@{view.untMisIcon}"
+                                        tools:src="@drawable/ic_weight_kg"
                                         android:tint="@color/gray_500" />
 
                                     <androidx.appcompat.widget.LinearLayoutCompat
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_gravity="center_vertical"
-                                        android:visibility="@{view.isOrderColli ? View.GONE  :View.VISIBLE}"
                                         android:gravity="start"
-                                        android:orientation="vertical">
+                                        android:orientation="vertical"
+                                        android:visibility="@{view.isOrderColli ? View.GONE : View.VISIBLE}">
 
                                         <androidx.appcompat.widget.AppCompatTextView
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
-                                            tools:text="KG"
                                             android:text="@{view.currentOrder.untOrd}"
                                             android:textAllCaps="true"
                                             android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                            android:textStyle="bold" />
+                                            android:textStyle="bold"
+                                            tools:text="KG" />
 
                                         <androidx.appcompat.widget.LinearLayoutCompat
                                             android:layout_width="wrap_content"
@@ -485,9 +487,9 @@
                                                 android:layout_height="wrap_content"
                                                 android:layout_marginStart="4dp"
                                                 android:text="@{view.currentOrder.untOrd}"
-                                                tools:text="KG"
                                                 android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                                android:textColor="@android:color/black" />
+                                                android:textColor="@android:color/black"
+                                                tools:text="KG" />
 
                                         </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -1141,14 +1143,22 @@
                             android:padding="8dp">
 
 
+
                             <com.google.android.material.button.MaterialButton
-                                android:id="@+id/button_confirm"
                                 style="@style/Button.PrimaryOutline"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/add_lu"
                                 app:icon="@drawable/ic_add_24dp"
-                                app:singleClick="@{() -> view.addULButtonClick()}" />
+                                app:singleClick="@{() -> viewModel.addUL()}" />
+
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/Button.PrimaryOutline"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/add_unit"
+                                app:icon="@drawable/ic_add_24dp"
+                                app:singleClick="@{() -> viewModel.addUnitButtonClick()}" />
 
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
index 339b5918..e0977529 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
@@ -20,6 +20,10 @@
         <variable
             name="view"
             type="it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailFragment" />
+
+        <variable
+            name="viewModel"
+            type="it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailViewModel" />
     </data>
 
     <FrameLayout
@@ -132,6 +136,7 @@
                                 tools:text="Ordine #218" />
 
                             <com.google.android.material.progressindicator.LinearProgressIndicator
+                                style="?attr/linearProgressIndicatorStyle"
                                 android:id="@+id/order_progress"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -711,420 +716,6 @@
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-                    <!--<RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:id="@+id/provenienza_layout"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_toStartOf="@id/totale_bancali_layout"
-                            android:orientation="horizontal"
-                            android:visibility="@{view.currentOrder.codAnag != null ? View.VISIBLE : View.GONE}">
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="8dp"
-                                android:src="@drawable/ic_person_filled_24dp"
-                                android:tint="@color/gray_500" />
-
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:orientation="vertical">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Provenienza"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                    android:textStyle="bold" />
-
-                                <androidx.appcompat.widget.LinearLayoutCompat
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="horizontal">
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:ellipsize="end"
-                                        android:maxLines="1"
-                                        android:text="@{view.currentOrder.ragSocAnag + ` (` + view.currentOrder.codAnag + `)`}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        android:visibility="@{view.currentOrder.ragSocAnag != null ? View.VISIBLE : View.GONE}"
-                                        tools:text="FRUDIS S.R.L. (F0312)" />
-
-                                </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:id="@+id/totale_bancali_layout"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:gravity="end"
-                            android:orientation="horizontal">
-
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:gravity="end"
-                                android:orientation="vertical">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Totale bancali"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                    android:textStyle="bold" />
-
-                                <androidx.appcompat.widget.LinearLayoutCompat
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="horizontal">
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{UtilityNumber.decimalToString(view.sumLUNumber, 0)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        tools:text="0" />
-
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=" UL"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black" />
-
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=" ("
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black" />
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{UtilityNumber.decimalToString(view.sumColliNumber, 0)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        tools:text="0" />
-
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=" COL)"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black" />
-
-                                </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="8dp"
-                                android:src="@drawable/ic_pallet"
-                                android:tint="@color/gray_500" />
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    </RelativeLayout>
-
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp">
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:id="@+id/cliente_layout"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="8dp"
-                                android:src="@drawable/ic_person_filled_24dp"
-                                android:tint="@color/gray_500" />
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:orientation="vertical">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Cliente"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                    android:textStyle="bold" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="@{view.currentOrder.descCommessa != null ? view.currentOrder.descCommessa : `-`}"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:textColor="@android:color/black"
-                                    tools:text="GRUNDHOFER GBMH" />
-
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_toEndOf="@id/cliente_layout"
-                            android:gravity="end"
-                            android:orientation="horizontal">
-
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:gravity="end"
-                                android:orientation="vertical">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Totale netto"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                    android:textStyle="bold" />
-
-                                <androidx.appcompat.widget.LinearLayoutCompat
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="horizontal">
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{UtilityNumber.decimalToString(view.sumNetKG, 0)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        tools:text="0" />
-
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=" KG"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black" />
-
-                                </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="8dp"
-                                android:src="@drawable/ic_weight_kg"
-                                android:tint="@color/gray_500" />
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    </RelativeLayout>
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp">
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:id="@+id/orari_produzione_layout"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="8dp"
-                                android:src="@drawable/ic_workers_96px"
-                                android:tint="@color/gray_500" />
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:orientation="vertical">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Orari produzione"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                    android:textStyle="bold" />
-
-
-                                <androidx.appcompat.widget.LinearLayoutCompat
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="horizontal"
-                                    android:visibility="@{view.currentOrder.dataInizD != null ? View.VISIBLE : View.GONE}">
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{UtilityDate.formatDate(view.currentOrder.dataInizD, UtilityDate.COMMONS_DATE_FORMATS.DM_TIME_SLASH)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        tools:text="11:00:00" />
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=" - "
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black" />
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{UtilityDate.formatDate(view.currentOrder.dataFineD, UtilityDate.COMMONS_DATE_FORMATS.DM_TIME_SLASH)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        android:visibility="@{view.currentOrder.dataFineD != null ? View.VISIBLE : View.GONE}"
-                                        tools:text="18:00:00" />
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="IN CORSO"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        android:visibility="@{view.currentOrder.dataFineD == null ? View.VISIBLE : View.GONE}"
-                                        tools:text="IN CORSO"
-                                        tools:visibility="gone" />
-                                </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Non avviato"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:textColor="@android:color/black"
-                                    android:visibility="@{view.currentOrder.dataInizD == null ? View.VISIBLE : View.GONE}"
-                                    tools:visibility="gone" />
-
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_toEndOf="@id/orari_produzione_layout"
-                            android:gravity="end"
-                            android:orientation="horizontal">
-
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:gravity="end"
-                                android:orientation="vertical">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Totale lordo"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                    android:textStyle="bold" />
-
-                                <androidx.appcompat.widget.LinearLayoutCompat
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="horizontal">
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{UtilityNumber.decimalToString(view.sumGrossKG, 0)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        tools:text="0" />
-
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=" KG"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black" />
-
-                                </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="8dp"
-                                android:src="@drawable/ic_weight_kg"
-                                android:tint="@color/gray_500" />
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    </RelativeLayout>-->
-
 
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="match_parent"
@@ -1135,13 +726,20 @@
 
 
                         <com.google.android.material.button.MaterialButton
-                            android:id="@+id/button_confirm"
                             style="@style/Button.PrimaryOutline"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/add_lu"
                             app:icon="@drawable/ic_add_24dp"
-                            app:singleClick="@{() -> view.addULButtonClick()}" />
+                            app:singleClick="@{() -> viewModel.addUL()}" />
+
+                        <com.google.android.material.button.MaterialButton
+                            style="@style/Button.PrimaryOutline"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/add_unit"
+                            app:icon="@drawable/ic_add_24dp"
+                            app:singleClick="@{() -> viewModel.addUnitButtonClick()}" />
 
 
                     </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c53e1467..84b76379 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -381,6 +381,7 @@
     <string name="seleziona_crea_ordine_a_pv">Seleziona / Crea ordine</string>
     <string name="add">Aggiungi</string>
     <string name="add_lu">Aggiungi pedana</string>
+    <string name="add_unit">Aggiungi unità</string>
     <string name="action_close">Chiudi</string>
     <string name="close_and_export">Chiudi ed esporta ordine</string>
     <string name="close_and_exit">Chiudi ordine</string>
diff --git a/app/src/main/res/values/buttons_style.xml b/app/src/main/res/values/buttons_style.xml
index c9e70ff9..f6ad59c2 100644
--- a/app/src/main/res/values/buttons_style.xml
+++ b/app/src/main/res/values/buttons_style.xml
@@ -9,6 +9,7 @@
         <!--        <item name="android:paddingTop">8dp</item>-->
         <!--        <item name="android:paddingBottom">8dp</item>-->
         <item name="iconTint">@color/colorPrimary</item>
+        <item name="strokeColor">@color/colorPrimary</item>
     </style>
 
     <style name="Button.PrimaryFull" parent="Widget.Material3.Button.UnelevatedButton">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f91c0ec..7445fae1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -386,6 +386,7 @@
     <string name="seleziona_crea_ordine_a_pv">Select/Create order</string>
     <string name="add">Add</string>
     <string name="add_lu">Add LU</string>
+    <string name="add_unit">Add unit</string>
     <string name="action_close">Close</string>
     <string name="close_and_export">Close and export</string>
     <string name="close_and_exit">Close order</string>

From 7c14688ef35f886804af3263576015c29362569a Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 3 Oct 2024 16:44:57 +0200
Subject: [PATCH 037/103] -> v1.41.01 (449)

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

diff --git a/app/build.gradle b/app/build.gradle
index 3e33d4d7..197a06ff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 448
-    def appVersionName = '1.41.00'
+    def appVersionCode = 449
+    def appVersionName = '1.41.01'
 
     signingConfigs {
         release {

From f5a0bf67c8c940a823775e828e20bae80433959f Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 8 Oct 2024 14:40:16 +0200
Subject: [PATCH 038/103] In rettifica giacenze aggiunta setup per la richiesta
 della modifica posizione

---
 .../core/settings/DBSettingsModel.java                 | 10 ++++++++++
 .../core/settings/SettingsManager.java                 |  6 ++++++
 .../rettifica_giacenze/RettificaGiacenzeViewModel.java |  3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index aaec3140..d0e0c679 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -81,6 +81,7 @@ public class DBSettingsModel {
     private boolean flagPickingLiberoEnableScanArt = false;
     private boolean flagAskDuplicateUDSSpedizione = false;
     private boolean suggestDataScad = false;
+    private boolean flagPositionChangeRequest = false;
     private String docInterniRequestNumDoc;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
@@ -703,4 +704,13 @@ public class DBSettingsModel {
         this.docInterniRequestNumDoc = docInterniRequestNumDoc;
         return this;
     }
+
+    public boolean isFlagPositionChangeRequest() {
+        return flagPositionChangeRequest;
+    }
+
+    public DBSettingsModel setFlagPositionChangeRequest(boolean flagPositionChangeRequest) {
+        this.flagPositionChangeRequest = flagPositionChangeRequest;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index af8b9d70..6350c3da 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -540,6 +540,12 @@ public class SettingsManager {
                 .setKeySection("ENABLE_SCAN_ART")
                 .setSetter(dbSettingsModelIstance::setFlagPickingLiberoEnableScanArt)
                 .setDefaultValue(true));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .setKeySection("ENABLE_POSITION_CHANGE_REQUEST")
+                .setSetter(dbSettingsModelIstance::setFlagPositionChangeRequest)
+                .setDefaultValue(true));
 
         stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
                 .setGestName("PICKING")
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
index b8266759..3f2a77b6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
@@ -29,6 +29,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsume
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -435,7 +436,7 @@ public class RettificaGiacenzeViewModel {
 
 
     private void askPostionChange(MtbColt mtbColt, Runnable onComplete) {
-        if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA || mtbColt.getSegno() == -1) {
+        if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA || mtbColt.getSegno() == -1 || !SettingsManager.iDB().isFlagPositionChangeRequest()) {
             onComplete.run();
             return;
         }

From b40781db84ac8b88afb28b2e19b4127b571d17ec Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 8 Oct 2024 14:42:57 +0200
Subject: [PATCH 039/103] -> v1.41.02 (450)

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

diff --git a/app/build.gradle b/app/build.gradle
index 197a06ff..abb785f3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 449
-    def appVersionName = '1.41.01'
+    def appVersionCode = 450
+    def appVersionName = '1.41.02'
 
     signingConfigs {
         release {

From 0328ebad852369bb45a522478afdafe0aa066141 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 18 Oct 2024 10:11:08 +0200
Subject: [PATCH 040/103] Aggiornato Gradle Plugin

---
 .idea/runConfigurations.xml              | 17 +++++++++++++++++
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 00000000..16660f1d
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d0fd349c..aeeee85b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.20'
-        agp_version = '8.4.0'
+        agp_version = '8.7.1'
     }
 
     repositories {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0b456dee..af8dff6c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Feb 13 15:14:43 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From 845a4c8faa1429c193591b895ba19503019335ba Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 18 Oct 2024 11:11:51 +0200
Subject: [PATCH 041/103] Aggiornato logo Integry

---
 .idea/deploymentTargetSelector.xml            |   8 +
 .../res/drawable/logo_integry_full_white.xml  | 101 +++---
 .../main/res/drawable/logo_integry_testo.xml  |  81 ++---
 app/src/main/res/raw/error_mail.html          | 287 ------------------
 4 files changed, 90 insertions(+), 387 deletions(-)
 delete mode 100644 app/src/main/res/raw/error_mail.html

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b268ef36..f23a4811 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-09-13T09:26:42.884931500Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=R52T60AZ93A" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/app/src/main/res/drawable/logo_integry_full_white.xml b/app/src/main/res/drawable/logo_integry_full_white.xml
index 486c595d..c7444ae2 100644
--- a/app/src/main/res/drawable/logo_integry_full_white.xml
+++ b/app/src/main/res/drawable/logo_integry_full_white.xml
@@ -1,61 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="84dp"
-    android:viewportWidth="250"
-    android:viewportHeight="105">
-
-    <path
-        android:pathData="M 29 28.5 H 252 V 81.8 H 29 V 28.5 Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M41.8,36.6h-9.1v-8.1h9.1V36.6z M41.8,73h-9.1V40.4h9.1V73z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M49.3,40.4h16.2c4.9,0,8.4,0.9,10.5,2.8c2.1,1.8,3.1,4.9,3.1,9.2V73h-8.6V53.4c0-2.4-0.4-4-1.1-4.8 s-2.3-1.1-4.6-1.1h-6.9V73h-8.6V40.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M83.2,40.4h6.1V28.5h8.6v11.8h9.1v6.5h-9.1v13.2c0,2.4,0.4,4.1,1.2,5c0.8,0.9,2.3,1.4,4.3,1.4h3.5V73h-7.9 c-3.2,0-5.6-0.9-7.3-2.6c-1.7-1.8-2.5-4.3-2.5-7.6V46.9h-6.1V40.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.7,73c-5.4,0-9.5-1.4-12.3-4.1c-2.8-2.8-4.2-6.8-4.2-12.2c0-5.4,1.4-9.4,4.2-12.2 c2.8-2.8,6.9-4.1,12.3-4.1h12.6v6.8h-11.4c-3.1,0-5.2,0.4-6.3,1.3c-1.1,0.9-1.7,2.5-1.7,4.8h19.5v6.8h-19.5 c0.1,2.3,0.6,3.9,1.6,4.8c1,0.9,3.1,1.3,6.4,1.3h11.5V73H126.7z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M175.4,71.9c0,4.5-1,7.8-3,9.9c-2,2.1-5.1,3.1-9.4,3.1h-16.9v-6.6h15.4c1.7,0,2.9-0.4,3.8-1.2 c0.9-0.8,1.3-2,1.3-3.5V73h-7c-3.6,0-6.2-0.3-7.8-0.8c-1.6-0.5-3.1-1.5-4.4-2.8c-1.6-1.5-2.8-3.3-3.6-5.5c-0.8-2.2-1.3-4.6-1.3-7.1 c0-2.5,0.4-4.9,1.3-7.1c0.8-2.2,2-4,3.6-5.5c1.4-1.4,3-2.4,4.9-3c1.9-0.6,4.3-0.9,7.4-0.9h15.7V71.9z M162.3,66.3h4.5V47.4h-4.5 c-2.2,0-3.7,0.1-4.5,0.2c-0.9,0.2-1.6,0.4-2.3,0.8c-1.3,0.8-2.3,1.9-2.9,3.2c-0.6,1.3-0.9,3-0.9,5.2c0,3.5,0.8,5.9,2.3,7.4 C155.5,65.6,158.3,66.3,162.3,66.3z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M182.6,40.4h14.5c3.4,0,5.8,0.6,7.1,1.8c1.4,1.2,2,3.4,2,6.4v5.4h-8.2v-4.2c0-1.3-0.2-2.1-0.7-2.6 c-0.5-0.4-1.5-0.7-3.1-0.7h-3V73h-8.6V40.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M225.8,65.8h6.9V40.4h8.6v31.8c0,4.3-1,7.5-3,9.6c-2,2.1-5.1,3.1-9.3,3.1h-16.9v-6.6h15.4 c1.7,0,2.9-0.4,3.8-1.2c0.9-0.8,1.3-2,1.3-3.5V73h-7.6c-4.9,0-8.4-1-10.4-2.9c-2.1-1.9-3.1-5.1-3.1-9.6V40.4h8.5v19.5 c0,2.5,0.4,4.1,1.1,4.8C221.9,65.4,223.4,65.8,225.8,65.8z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:strokeColor="#231F20"
-        android:strokeWidth="0.75"
-        android:strokeMiterLimit="10"
-        android:pathData="M35.3,7.8" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M84.3,24.8c-7.3-8-17.8-13-29.5-13c-5.5,0-10.7,1.1-15.5,3.1l-3.9-7.2c6-2.7,12.6-4.1,19.5-4.1 c14.3,0,27.1,6.2,35.9,16.1L84.3,24.8z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M93,80.8c-8.7,11.4-22.4,18.7-37.8,18.8l0-8.1c12.8-0.1,24.1-6.3,31.3-15.7L93,80.8z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:strokeColor="#231F20"
-        android:strokeWidth="0.75"
-        android:strokeMiterLimit="10"
-        android:pathData="M19.8,84.4" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M16.5,80.5c-6.1-8-9.7-18.1-9.7-28.9c0-17.6,9.5-33.1,23.7-41.4l3.9,7.2c-11.7,6.9-19.5,19.7-19.5,34.3 c0,8.9,2.9,17.2,7.9,23.8L16.5,80.5z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:strokeColor="#231F20"
-        android:strokeWidth="0.75"
-        android:strokeMiterLimit="10"
-        android:pathData="M39.3,15" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M19.8,84.4l6.1-5.2c6.3,6.6,14.7,11,24.2,12.1l0,8.1C38.1,98.2,27.5,92.7,19.8,84.4" />
-</vector>
\ No newline at end of file
+    android:width="646.51dp"
+    android:height="154.53dp"
+    android:viewportWidth="646.51"
+    android:viewportHeight="154.53">
+  <path
+      android:pathData="M203.9,37.12h14.87v66.46h-14.87z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M279.96,77.4l-31.44,-40.28l-10.45,0l0,66.46l14.87,0l0,-39.78l30.97,39.78l11.02,0l0,-66.46l-14.97,0z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M309.61,50.11l20.8,0l0,53.47l14.97,0l0,-53.47l20.71,0l0,-12.99l-56.48,0z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M395.74,75.9l29.65,0l0,-12.52l-29.65,0l0,-13.46l32.48,0l0,-12.8l-32.48,0l-3.48,0l-11.39,0l0,66.46l11.39,0l3.48,0l33.04,0l0,-12.8l-33.04,0z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M475.47,78.45l18.95,0.3c-0.36,1.33 -0.8,2.6 -1.4,3.75c-1.48,2.82 -3.58,4.97 -6.31,6.45c-2.73,1.48 -6.01,2.21 -9.84,2.21c-3.83,0 -7.22,-0.89 -10.17,-2.68c-2.95,-1.79 -5.27,-4.25 -6.97,-7.39c-1.69,-3.14 -2.54,-6.75 -2.54,-10.83c0,-4.14 0.86,-7.77 2.59,-10.87c1.73,-3.1 4.13,-5.52 7.2,-7.25c3.07,-1.73 6.56,-2.59 10.45,-2.59c3.58,0 6.83,0.71 9.75,2.12c2.92,1.41 5.41,3.5 7.48,6.26l10.16,-10.17c-3.07,-3.64 -6.96,-6.51 -11.67,-8.61c-4.71,-2.1 -9.92,-3.15 -15.63,-3.15c-4.96,0 -9.59,0.88 -13.88,2.64c-4.3,1.76 -8.08,4.19 -11.35,7.3c-3.26,3.1 -5.8,6.71 -7.63,10.82c-1.82,4.11 -2.73,8.61 -2.73,13.51c0,4.83 0.89,9.32 2.68,13.46c1.79,4.14 4.25,7.78 7.39,10.92c3.14,3.14 6.82,5.6 11.06,7.39c4.24,1.79 8.8,2.68 13.7,2.68c6.59,0 12.41,-1.4 17.46,-4.19c5.05,-2.79 9,-6.92 11.86,-12.38c2.85,-5.46 4.28,-12.14 4.28,-20.05v-2.16h-34.92V78.45z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M540.71,48.7h10.64c2.89,0 5.13,0.79 6.73,2.35c1.6,1.57 2.4,3.55 2.4,5.93c0,2.51 -0.82,4.5 -2.45,5.98c-1.63,1.47 -3.89,2.21 -6.78,2.21h-10.54V48.7zM564.52,73.83c3.39,-1.63 6.02,-3.91 7.91,-6.83c1.88,-2.92 2.83,-6.38 2.83,-10.4c0,-3.77 -0.93,-7.12 -2.78,-10.07c-1.85,-2.95 -4.44,-5.26 -7.76,-6.92c-3.33,-1.66 -7.22,-2.49 -11.67,-2.49h-12.33h-3.48h-11.39v66.46h14.87v-27.3h1.52l19.75,27.3h17.6l-21.19,-27.82C560.61,75.35 562.66,74.73 564.52,73.83"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M629.66,37.12l-14.12,24.19l-14.12,-24.19l-17.13,0l23.72,38.72l0,27.74l14.97,0l0,-28.32l23.53,-38.14z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M10.98,100.52c-4.47,0 -8.48,-3.14 -9.41,-7.69C0.53,87.74 0,82.5 0,77.27C0,52.12 12.3,28.47 32.91,14c4.35,-3.05 10.34,-2 13.39,2.34c3.05,4.34 2,10.34 -2.34,13.39C28.47,40.61 19.23,58.38 19.23,77.27c0,3.94 0.4,7.88 1.18,11.71c1.06,5.2 -2.29,10.28 -7.49,11.35C12.26,100.45 11.62,100.52 10.98,100.52z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M77.27,154.53c-15.33,0 -30.14,-4.48 -42.85,-12.96c-4.42,-2.95 -5.61,-8.92 -2.66,-13.33c2.95,-4.42 8.92,-5.61 13.33,-2.66c9.53,6.36 20.66,9.72 32.17,9.72c18.88,0 36.64,-9.23 47.51,-24.69c3.05,-4.34 9.05,-5.39 13.39,-2.33c4.34,3.05 5.39,9.05 2.33,13.39C126.03,142.25 102.39,154.53 77.27,154.53z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M143.87,98.86c-0.56,0 -1.13,-0.05 -1.7,-0.15c-5.23,-0.93 -8.71,-5.93 -7.77,-11.16c0.6,-3.37 0.91,-6.83 0.91,-10.29c0,-7.24 -1.31,-14.3 -3.91,-20.99c-1.92,-4.95 0.53,-10.52 5.48,-12.44c4.95,-1.92 10.52,0.54 12.44,5.48c3.46,8.91 5.21,18.31 5.21,27.94c0,4.59 -0.41,9.19 -1.21,13.67C152.49,95.6 148.44,98.86 143.87,98.86z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M124.19,38.15c-2.4,0 -4.8,-0.89 -6.67,-2.69c-10.87,-10.47 -25.16,-16.23 -40.26,-16.23c-3.42,0 -6.84,0.3 -10.17,0.89c-5.23,0.92 -10.22,-2.57 -11.14,-7.8s2.57,-10.22 7.8,-11.14C68.18,0.4 72.73,0 77.27,0c20.09,0 39.13,7.67 53.6,21.61c3.82,3.68 3.94,9.77 0.26,13.59C129.23,37.16 126.71,38.15 124.19,38.15z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M41.24,101.68m-10.9,0a10.9,10.9 0,1 1,21.8 0a10.9,10.9 0,1 1,-21.8 0"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/logo_integry_testo.xml b/app/src/main/res/drawable/logo_integry_testo.xml
index 32918cc6..d8714fea 100644
--- a/app/src/main/res/drawable/logo_integry_testo.xml
+++ b/app/src/main/res/drawable/logo_integry_testo.xml
@@ -1,41 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="636.577dp"
-    android:height="271.126dp"
-    android:viewportWidth="636.577"
-    android:viewportHeight="271.126">
-
-    <path
-        android:fillColor="#FF9900"
-        android:pathData="M207.414,61.361c-18.867-18.878-44.938-30.555-73.736-30.555c-12.746,0-24.957,2.287-36.245,6.474 l-8.88-23.535c14.332-5.453,29.88-8.438,46.125-8.438c35.734,0,68.094,14.445,91.559,37.814L207.414,61.361z" />
-    <path
-        android:fillColor="#349933"
-        android:pathData="M63.193,211.868c14.326,13.152,32.343,22.35,52.318,25.859l-4.326,24.957 c-24.722-4.521-46.996-16.049-64.689-32.449L63.193,211.868z" />
-    <path
-        android:fillColor="#0199CB"
-        android:pathData="M33.563,216.368C15.648,194.12,4.928,165.84,4.928,135.055c0-48.096,26.17-90.081,65.047-112.49 l12.32,21.762c-31.569,17.917-52.867,51.835-52.867,90.728c0,24.906,8.734,47.771,23.306,65.701L33.563,216.368z" />
-    <path
-        android:fillColor="#EC0200"
-        android:pathData="M131.927,239.29c0.582,0.01,1.166,0.016,1.75,0.016c24.691,0,47.377-8.586,65.238-22.932l15.982,20.666 c-22.076,17.391-49.938,27.766-80.221,27.766c-1.115,0-2.227-0.014-3.336-0.043L131.927,239.29z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M101.414,95.458H75.426V72.165h25.987V95.458z M101.414,199.928H75.426v-93.78h25.987V199.928z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M114.606,106.148h46.586c14.08,0,24.132,2.651,30.159,7.953c6.025,5.302,9.039,14.095,9.039,26.378v59.449H175.62v-56.406 c0-7.01-1.086-11.561-3.259-13.646c-2.173-2.086-6.534-3.129-13.081-3.129h-19.903v73.181h-24.771V106.148z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M203.937,106.148h17.47V72.165h24.771v33.983h26.161v18.687h-26.161v37.894c0,6.953,1.187,11.777,3.563,14.471 c2.375,2.695,6.519,4.043,12.429,4.043h10.169v18.686H249.74c-9.156,0-16.166-2.533-21.033-7.605 c-4.867-5.068-7.301-12.326-7.301-21.771v-45.716h-17.47V106.148z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M320.557,199.928c-15.529,0-27.277-3.955-35.244-11.863c-7.967-7.91-11.95-19.568-11.95-34.982 c0-15.412,3.998-27.087,11.994-35.027c7.996-7.938,19.729-11.907,35.2-11.907h36.156v19.556h-32.767 c-8.982,0-15.022,1.275-18.122,3.824c-3.1,2.55-4.767,7.158-4.997,13.82h55.886v19.555h-55.886 c0.23,6.723,1.782,11.314,4.649,13.775c2.869,2.465,8.966,3.695,18.296,3.695h32.94v19.555H320.557z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M452.301,196.54c0,12.863-2.868,22.307-8.604,28.334c-5.736,6.025-14.688,9.039-26.856,9.039h-48.585v-19.035h44.326 c4.75,0,8.4-1.145,10.951-3.434c2.549-2.289,3.824-5.605,3.824-9.951v-1.564h-20.164c-10.43,0-17.935-0.781-22.511-2.346 c-4.578-1.564-8.809-4.229-12.689-7.996c-4.463-4.229-7.896-9.502-10.3-15.818c-2.404-6.314-3.606-13.152-3.606-20.512 c0-7.242,1.202-14.008,3.606-20.295c2.404-6.287,5.837-11.544,10.3-15.775c3.998-3.939,8.691-6.764,14.08-8.474 c5.389-1.708,12.429-2.564,21.12-2.564h45.108V196.54z M414.493,180.547h12.863v-54.322h-12.863 c-6.201,0-10.547,0.232-13.037,0.695c-2.492,0.465-4.665,1.247-6.519,2.347c-3.824,2.319-6.62,5.375-8.388,9.168 c-1.768,3.797-2.65,8.736-2.65,14.82c0,10.025,2.229,17.078,6.692,21.162C395.053,178.504,403.021,180.547,414.493,180.547z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M464.711,106.148h41.632c9.734,0,16.557,1.753,20.469,5.258c3.91,3.506,5.866,9.634,5.866,18.382v15.645h-23.641v-12.082 c0-3.65-0.651-6.097-1.956-7.343c-1.303-1.246-4.273-1.869-8.908-1.869h-8.691v75.789h-24.771V106.148z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M580.463,179.243h19.903v-73.094h24.771v91.26c0,12.398-2.898,21.582-8.691,27.551c-5.795,5.967-14.66,8.953-26.596,8.953 h-48.585v-19.035h44.326c4.75,0,8.4-1.145,10.951-3.434c2.549-2.289,3.824-5.605,3.824-9.951v-1.564h-21.902 c-14.023,0-24.019-2.766-29.985-8.301c-5.969-5.531-8.952-14.76-8.952-27.682v-57.797h24.51v55.885 c0,7.07,1.057,11.705,3.173,13.906C569.323,178.143,573.74,179.243,580.463,179.243z" />
-</vector>
\ No newline at end of file
+    android:width="646.51dp"
+    android:height="154.53dp"
+    android:viewportWidth="646.51"
+    android:viewportHeight="154.53">
+  <path
+      android:pathData="M203.9,37.12h14.87v66.46h-14.87z"
+      android:fillColor="#181715"/>
+  <path
+      android:pathData="M279.96,77.4l-31.44,-40.28l-10.45,0l0,66.46l14.87,0l0,-39.78l30.97,39.78l11.02,0l0,-66.46l-14.97,0z"
+      android:fillColor="#181715"/>
+  <path
+      android:pathData="M309.61,50.11l20.8,0l0,53.47l14.97,0l0,-53.47l20.71,0l0,-12.99l-56.48,0z"
+      android:fillColor="#181715"/>
+  <path
+      android:pathData="M395.74,75.9l29.65,0l0,-12.52l-29.65,0l0,-13.46l32.48,0l0,-12.8l-32.48,0l-3.48,0l-11.39,0l0,66.46l11.39,0l3.48,0l33.04,0l0,-12.8l-33.04,0z"
+      android:fillColor="#181715"/>
+  <path
+      android:pathData="M475.47,78.45l18.95,0.3c-0.36,1.33 -0.8,2.6 -1.4,3.75c-1.48,2.82 -3.58,4.97 -6.31,6.45c-2.73,1.48 -6.01,2.21 -9.84,2.21c-3.83,0 -7.22,-0.89 -10.17,-2.68c-2.95,-1.79 -5.27,-4.25 -6.97,-7.39c-1.69,-3.14 -2.54,-6.75 -2.54,-10.83c0,-4.14 0.86,-7.77 2.59,-10.87c1.73,-3.1 4.13,-5.52 7.2,-7.25c3.07,-1.73 6.56,-2.59 10.45,-2.59c3.58,0 6.83,0.71 9.75,2.12c2.92,1.41 5.41,3.5 7.48,6.26l10.16,-10.17c-3.07,-3.64 -6.96,-6.51 -11.67,-8.61c-4.71,-2.1 -9.92,-3.15 -15.63,-3.15c-4.96,0 -9.59,0.88 -13.88,2.64c-4.3,1.76 -8.08,4.19 -11.35,7.3c-3.26,3.1 -5.8,6.71 -7.63,10.82c-1.82,4.11 -2.73,8.61 -2.73,13.51c0,4.83 0.89,9.32 2.68,13.46c1.79,4.14 4.25,7.78 7.39,10.92c3.14,3.14 6.82,5.6 11.06,7.39c4.24,1.79 8.8,2.68 13.7,2.68c6.59,0 12.41,-1.4 17.46,-4.19c5.05,-2.79 9,-6.92 11.86,-12.38c2.85,-5.46 4.28,-12.14 4.28,-20.05v-2.16h-34.92V78.45z"
+      android:fillColor="#181715"/>
+  <path
+      android:pathData="M540.71,48.7h10.64c2.89,0 5.13,0.79 6.73,2.35c1.6,1.57 2.4,3.55 2.4,5.93c0,2.51 -0.82,4.5 -2.45,5.98c-1.63,1.47 -3.89,2.21 -6.78,2.21h-10.54V48.7zM564.52,73.83c3.39,-1.63 6.02,-3.91 7.91,-6.83c1.88,-2.92 2.83,-6.38 2.83,-10.4c0,-3.77 -0.93,-7.12 -2.78,-10.07c-1.85,-2.95 -4.44,-5.26 -7.76,-6.92c-3.33,-1.66 -7.22,-2.49 -11.67,-2.49h-12.33h-3.48h-11.39v66.46h14.87v-27.3h1.52l19.75,27.3h17.6l-21.19,-27.82C560.61,75.35 562.66,74.73 564.52,73.83"
+      android:fillColor="#181715"/>
+  <path
+      android:pathData="M629.66,37.12l-14.12,24.19l-14.12,-24.19l-17.13,0l23.72,38.72l0,27.74l14.97,0l0,-28.32l23.53,-38.14z"
+      android:fillColor="#181715"/>
+  <path
+      android:pathData="M10.98,100.52c-4.47,0 -8.48,-3.14 -9.41,-7.69C0.53,87.74 0,82.5 0,77.27C0,52.12 12.3,28.47 32.91,14c4.35,-3.05 10.34,-2 13.39,2.34c3.05,4.34 2,10.34 -2.34,13.39C28.47,40.61 19.23,58.38 19.23,77.27c0,3.94 0.4,7.88 1.18,11.71c1.06,5.2 -2.29,10.28 -7.49,11.35C12.26,100.45 11.62,100.52 10.98,100.52z"
+      android:fillColor="#F39200"/>
+  <path
+      android:pathData="M77.27,154.53c-15.33,0 -30.14,-4.48 -42.85,-12.96c-4.42,-2.95 -5.61,-8.92 -2.66,-13.33c2.95,-4.42 8.92,-5.61 13.33,-2.66c9.53,6.36 20.66,9.72 32.17,9.72c18.88,0 36.64,-9.23 47.51,-24.69c3.05,-4.34 9.05,-5.39 13.39,-2.33c4.34,3.05 5.39,9.05 2.33,13.39C126.03,142.25 102.39,154.53 77.27,154.53z"
+      android:fillColor="#00A0DE"/>
+  <path
+      android:pathData="M143.87,98.86c-0.56,0 -1.13,-0.05 -1.7,-0.15c-5.23,-0.93 -8.71,-5.93 -7.77,-11.16c0.6,-3.37 0.91,-6.83 0.91,-10.29c0,-7.24 -1.31,-14.3 -3.91,-20.99c-1.92,-4.95 0.53,-10.52 5.48,-12.44c4.95,-1.92 10.52,0.54 12.44,5.48c3.46,8.91 5.21,18.31 5.21,27.94c0,4.59 -0.41,9.19 -1.21,13.67C152.49,95.6 148.44,98.86 143.87,98.86z"
+      android:fillColor="#269C38"/>
+  <path
+      android:pathData="M124.19,38.15c-2.4,0 -4.8,-0.89 -6.67,-2.69c-10.87,-10.47 -25.16,-16.23 -40.26,-16.23c-3.42,0 -6.84,0.3 -10.17,0.89c-5.23,0.92 -10.22,-2.57 -11.14,-7.8s2.57,-10.22 7.8,-11.14C68.18,0.4 72.73,0 77.27,0c20.09,0 39.13,7.67 53.6,21.61c3.82,3.68 3.94,9.77 0.26,13.59C129.23,37.16 126.71,38.15 124.19,38.15z"
+      android:fillColor="#E62400"/>
+  <path
+      android:pathData="M41.24,101.68m-10.9,0a10.9,10.9 0,1 1,21.8 0a10.9,10.9 0,1 1,-21.8 0"
+      android:fillColor="#1D1D1B"/>
+</vector>
diff --git a/app/src/main/res/raw/error_mail.html b/app/src/main/res/raw/error_mail.html
deleted file mode 100644
index c11e6997..00000000
--- a/app/src/main/res/raw/error_mail.html
+++ /dev/null
@@ -1,287 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-        <meta name="viewport" content="width=device-width">
-        <title>*|Mail peppino|*</title>
-
-        <meta property="og:title" content="*|MC:SUBJECT|*">
-
-        <style type="text/css">
-		@import url('https://fonts.googleapis.com/css?family=Open+Sans');
-
-        .ExternalClass {
-            width: 100%;
-        }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-            line-height: 100%;
-        }
-        body {
-            -webkit-text-size-adjust: 100%;
-            -ms-text-size-adjust: 100%;
-            text-size-adjust: 100%;
-            margin: 0;
-            padding: 0;
-        }
-        table {
-            border-spacing: 0;
-            border-collapse: collapse;
-        }
-        table td {
-            border-collapse: collapse;
-        }
-        img {
-            -ms-interpolation-mode: bicubic;
-            display: block;
-            outline: none;
-            text-decoration: none;
-        }
-
-        a img {
-            border: none;
-        }
-        p {
-            margin: 0;
-            padding: 0;
-            margin-bottom: 0;
-        }
-        h1,
-        h2,
-        h3,
-        h4,
-        h5,
-        h6 {
-            color: #333333;
-            line-height: 100%;
-        }
-        body,
-        #body_style {
-            width: 100%!important;
-            min-height: 1000px;
-            color: #333333;
-            background: #fff;
-            font-family: 'Open Sans','Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-            font-size: 13px;
-            line-height: 1.4;
-        }
-        a {
-            color: #114eb1;
-            text-decoration: none;
-        }
-        a:link {
-            color: #114eb1;
-            text-decoration: none;
-        }
-
-        a:visited {
-            color: #183082;
-            text-decoration: none;
-        }
-
-        a:focus {
-            color: #0066ff!important;
-        }
-
-        a:hover {
-            color: #0066ff!important;
-        }
-
-        a[href^="tel"],
-        a[href^="sms"] {
-            text-decoration: none;
-            color: #333333;
-            pointer-events: none;
-            cursor: default;
-        }
-
-        .mobile_link a[href^="tel"],
-        .mobile_link a[href^="sms"] {
-            text-decoration: default;
-            color: #6e5c4f!important;
-            pointer-events: auto;
-            cursor: default;
-        }
-
-        @media only screen and (max-width: 639px) {
-            .hide {
-                display: none!important;
-            }
-            .table {
-                width: 320px!important;
-            }
-            .innertable {
-                width: 280px!important;
-            }
-            .heroimage {
-                width: 280px!important;
-                height: 100px!important;
-            }
-            .shadow {
-                width: 280px!important;
-                height: 4px!important;
-            }
-            .collapse-cell {
-                width: 320px!important;
-            }
-            .social-media img {
-                float: left!important;
-                margin: 0 1em 0 0 important;
-            }
-        }
-    </style>
-    </head>
-
-    <body style="width:100%!important;min-height:1000px;color:#333333;background: #fff;font-family: 'Open Sans','Segoe UI', Tahoma, Geneva, Verdana, sans-serif;font-size:13px;line-height:1.4;" alink="#114eb1" link="#114eb1" bgcolor="#e0dbcf" text="#333333">
-
-        <div id="body_style">
-
-            <table cellpadding="0" cellspacing="0" border="0" align="center" style="width:100%!important;margin:0;padding:0;font-family: 'Open Sans';">
-                <tbody>
-                    <tr bgcolor="#fff">
-                        <td>
-
-                            <table width="600" cellpadding="0" cellspacing="0" border="0" align="center" class="table" style="
-    border: solid 1px #d3d3d3;
-">
-
-                                <tbody>
-
-                                    <tr>
-                                        <td>
-                                            <table bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0" border="0">
-                                                <tbody>
-                                                    <tr style="text-align: center;">
-
-                                                        <td width="100%" style="
-    padding-top: 24px;
-    padding-bottom: 24px;
-">
-                                                            <center>
-                                                                <img alt="" height="60" src="https://www.integry.it/assets/common/logo/logo_integry_completo_1024w.png" />
-                                                            </center>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </td>
-
-                                    </tr>
-
-                                    <tr style="
-    background: #319be5;
-">
-                                        <td style="
-    padding: 24px;
-    line-height: 1.6;
-">
-                                            <span style="
-    color: white;
-    opacity: 0.7;
-             ">__APP_NAME__</span>
-
-                                            <span style="
-    color: white;
-    opacity: 0.7;
-    font-size: 20px;
-    line-height: 0.2;
-    ">·</span>
-                                            <span style="
-    color: white;
-    opacity: 0.7;
-             ">__APP_PACKAGE__ v__APP_VERSION__ (__APP_VERSION_CODE__)</span>
-                                            <br><span style="
-    color: white;
-    font-size: 24px;
-">Nuova segnalazione (__CUSTOMER_NAME__)</span>
-                                        </td>
-                                    </tr>
-                                    <tr style="
-    background: #ebeff2;
-">
-                                        <td style="
-    padding: 32px 0 0px 0;
-">
-
-                                            <center style="padding: 0 100px 0 100px;">
-
-                                                <table>
-                                                    <tbody style="">
-                                                        <tr style="
-">
-                                                            <td style="
-    padding: 24px;
-    color: white;
-    font-size: 20px;
-    background: #fab301;
-    border-radius: 5px 5px 0 0;
-">
-                                                                <center>
-
-                                                                    <img src="https://www.integry.it/images/exclamation.png" width="80" height="80" />
-
-                                                                    <br> Dai forza! &Egrave; stato riscontrato un problema fatale: __ERROR_TITLE__
-                                                                </center>
-                                                            </td>
-                                                        </tr>
-
-                                                        <tr style="
-">
-                                                            <td style="
-    padding: 20px 15px;
-    border: solid 1px #d3d3d3;
-    background: white;
-">
-                                                                <span style="
-    font-weight: bold;
-">__ERROR_DETAIL__ (__ERROR_DATE__)</span>
-                                                                <pre>__ERROR_STACKTRACE__</pre>
-                                                            </td>
-                                                        </tr>
-
-                                                    </tbody>
-                                                </table>
-
-                                            </center>
-
-                                            <hr style="
-    border: solid 0.5px #d3d3d3;
-    margin-top: 24px;
-">
-                                        </td>
-                                    </tr>
-                                    <tr style="
-    background: #ebeff2;
-">
-                                        <td style="
-    padding: 24px;
-">
-                                            <center>
-                                                <span style="
-    color: #7c7d81;
-    font-size: small;
-    font-weight: bold;
-">Questa email &egrave; solo una notifica riguardo un errore che si &egrave; verificato in un progetto</span>
-                                            </center>
-
-                                        </td>
-                                    </tr>
-
-                                </tbody>
-                            </table>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-
-        </div>
-
-    </body>
-
-</html>
\ No newline at end of file

From 2b467f56d7baf9a4bd8904c74ba6787ae44c9be8 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 5 Nov 2024 10:43:32 +0100
Subject: [PATCH 042/103] Migliorato servizio di importColliDaProduzione

---
 .../ProdRientroMerceOrderDetailFragment.java  | 122 +++++++++---------
 .../ProdRientroMerceOrderDetailModule.java    |   7 +-
 ...ntroMerceOrderDetailPickedQuantityDTO.java |  40 ++++--
 .../ProdRientroMerceOrderDetailViewModel.java | 115 +++++++++++------
 ...odRientroMerceOrderDetailRESTConsumer.java |  34 ++---
 ...roMerceOrderDetailRESTConsumerService.java |   5 +-
 .../ImportColliDaProduzioneRequestDTO.java    |  11 ++
 .../ProdRientroMerceOrderListAdapter.java     |   8 +-
 .../ProdRientroMerceOrderListFragment.java    |   2 +-
 ...agment_prod_rientro_merce_order_detail.xml |  13 +-
 ...agment_prod_rientro_merce_order_detail.xml |  13 +-
 app/src/main/res/values-it/strings.xml        |   2 +-
 app/src/main/res/values/strings.xml           |   2 +-
 build.gradle                                  |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 15 files changed, 227 insertions(+), 151 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
index 15bde7f6..b37b47a6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
@@ -20,12 +20,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.ComparatorCompat;
 import com.annimon.stream.Stream;
-import com.google.gson.reflect.TypeToken;
 import com.harrysoft.androidbluetoothserial.BluetoothManager;
 import com.harrysoft.androidbluetoothserial.BluetoothSerialDevice;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -38,12 +36,10 @@ import it.integry.integrywmsnative.core.exception.BluetoothConnectionException;
 import it.integry.integrywmsnative.core.expansion.AtomicBigDecimal;
 import it.integry.integrywmsnative.core.expansion.BaseFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.DtbOrdSteps;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
-import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.FragmentProdRientroMerceOrderDetailBinding;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
@@ -201,7 +197,7 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
     private void refreshOrder() {
         OrdineLavorazioneDTO currentOrd = currentOrder.getValue();
 
-        if(currentOrd != null) {
+        if (currentOrd != null) {
             isOrderColli.set(currentOrd.getQtaCnf().compareTo(BigDecimal.ONE) == 0);
         }
 
@@ -277,70 +273,72 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
             this.onError(new Exception("Nessun ordine rilevato!"));
             return;
         }
-        String codProd = currentOrder.getCodProd();
-        mArticoloRESTConsumer.getByCodMart(codProd, mtbAart -> {
 
-            String sql = "SELECT TOP 1 * " +
-                    "FROM ( " +
-                    "         SELECT MAX(id_step) OVER ( PARTITION BY gestione, num_ord, data_ord) as last_step, " +
-                    "                * " +
-                    "         FROM dtb_ord_steps " +
-                    "         WHERE cod_jfas IS NOT NULL " +
-                    "           AND gestione = " + UtilityDB.valueToString(currentOrder.getGestione()) +
-                    "           AND num_ord = " + UtilityDB.valueToString(currentOrder.getNumOrd()) +
-                    "           AND data_ord = " + UtilityDB.valueToString(currentOrder.getDataOrdD()) +
-                    "     ) tmp " +
-                    "WHERE data_iniz IS NOT NULL " +
-                    "  AND (data_fine IS NULL OR last_step = id_step) " +
-                    "ORDER BY id_step DESC";
+        mViewModel.retrieveOrderData((mtbAart, codJfas) -> {
+            this.onLoadingEnded();
 
-            mSystemRESTConsumer.<List<DtbOrdSteps>>processSql(sql, new TypeToken<ArrayList<DtbOrdSteps>>() {
-            }.getType(), dtbOrdStep -> {
-
-                this.onLoadingEnded();
-
-                String codTcol = currentOrder.getCodTcolUl();
-                if (UtilityString.isNullOrEmpty(codTcol)) {
-                    if (!UtilityString.isNullOrEmpty(mLatestCodTcol)) {
-                        codTcol = mLatestCodTcol;
-                    } else {
-                        codTcol = mtbAart.getCodTcolUl();
-                    }
+            String codTcol = currentOrder.getCodTcolUl();
+            if (UtilityString.isNullOrEmpty(codTcol)) {
+                if (!UtilityString.isNullOrEmpty(mLatestCodTcol)) {
+                    codTcol = mLatestCodTcol;
+                } else {
+                    codTcol = mtbAart.getCodTcolUl();
                 }
+            }
 
-                DialogInputLUProdDTO dialogInputLUProdDTO = new DialogInputLUProdDTO()
-                        .setMtbAart(mtbAart)
-                        .setNumCnf(currentOrder.getColliPedana())
-                        .setQtaCnf(mtbAart.getQtaCnf())
-                        .setQtaTot(currentOrder.getColliPedana().multiply(mtbAart.getQtaCnf()))
-                        .setPartitaMag(currentOrder.getPartitaMag())
-                        .setDataScad(currentOrder.getDataScadD())
-                        .setCodJfasParent(currentOrder.getCodJfas())
-                        .setCodTcol(codTcol)
-                        .setSuggestedCodJfas(dtbOrdStep != null && dtbOrdStep.size() > 0 ? dtbOrdStep.get(0).getCodJfas() : null);
+            DialogInputLUProdDTO dialogInputLUProdDTO = new DialogInputLUProdDTO()
+                    .setMtbAart(mtbAart)
+                    .setNumCnf(currentOrder.getColliPedana())
+                    .setQtaCnf(mtbAart.getQtaCnf())
+                    .setQtaTot(currentOrder.getColliPedana().multiply(mtbAart.getQtaCnf()))
+                    .setPartitaMag(currentOrder.getPartitaMag())
+                    .setDataScad(currentOrder.getDataScadD())
+                    .setCodJfasParent(currentOrder.getCodJfas())
+                    .setCodTcol(codTcol)
+                    .setSuggestedCodJfas(codJfas);
 
 
-                DialogInputLUProdView
-                        .newInstance(mConnectedBluetoothDevice != null ? mConnectedBluetoothDevice.toSimpleDeviceInterface() : null, dialogInputLUProdDTO, resultDTO -> {
-                            ProdRientroMerceOrderDetailPickedQuantityDTO pickedQuantityDTO = new ProdRientroMerceOrderDetailPickedQuantityDTO()
-                                    .setNumCnf(resultDTO.getNumCnf())
-                                    .setPesoCollo(resultDTO.getPesoCollo())
-                                    .setPesoNetto(resultDTO.getPesoNetto())
-                                    .setTaraPed(resultDTO.getTaraPed())
-                                    .setTaraCol(resultDTO.getTaraCol())
-                                    .setPesoLordo(resultDTO.getPesoLordo())
-                                    .setMtbTCol(resultDTO.getMtbTCol())
-                                    .setJtbFasi(resultDTO.getJtbFasi());
+            DialogInputLUProdView
+                    .newInstance(mConnectedBluetoothDevice != null ? mConnectedBluetoothDevice.toSimpleDeviceInterface() : null, dialogInputLUProdDTO, resultDTO -> {
+                        ProdRientroMerceOrderDetailPickedQuantityDTO pickedQuantityDTO = new ProdRientroMerceOrderDetailPickedQuantityDTO()
+                                .setNumCnf(resultDTO.getNumCnf())
+                                .setQtaCnf(resultDTO.getPesoCollo())
+                                .setQtaCol(resultDTO.getPesoNetto())
+                                .setPesoCollo(resultDTO.getPesoCollo())
+                                .setPesoNetto(resultDTO.getPesoNetto())
+                                .setTaraPed(resultDTO.getTaraPed())
+                                .setTaraCol(resultDTO.getTaraCol())
+                                .setPesoLordo(resultDTO.getPesoLordo())
+                                .setMtbTCol(resultDTO.getMtbTCol())
+                                .setCodJfas(resultDTO.getJtbFasi() != null ? resultDTO.getJtbFasi().getCodJfas() : codJfas);
 
-                            this.mViewModel.createLU(pickedQuantityDTO);
-                        }, () -> {
-                            this.onLoadingEnded();
-                        })
-                        .show(requireActivity().getSupportFragmentManager(), "tag");
+                        this.mViewModel.createLU(pickedQuantityDTO);
+                    }, this::onLoadingEnded)
+                    .show(requireActivity().getSupportFragmentManager(), "tag");
 
-            }, this::onError);
+        });
+    }
 
-        }, this::onError);
+    public void addSingleUnitButtonClick() {
+        this.onLoadingStarted();
+
+        OrdineLavorazioneDTO currentOrder = this.currentOrder.getValue();
+        if (currentOrder == null) {
+            this.onError(new Exception("Nessun ordine rilevato!"));
+            return;
+        }
+        mViewModel.retrieveOrderData((mtbAart, codJfas) -> {
+            ProdRientroMerceOrderDetailPickedQuantityDTO pickedQuantityDTO = new ProdRientroMerceOrderDetailPickedQuantityDTO()
+                    .setNumCnf(BigDecimal.ONE)
+                    .setQtaCnf(currentOrder.getQtaCnf())
+                    .setQtaCol(currentOrder.getQtaCnf())
+                    .setCodJfas(codJfas);
+
+
+            this.mViewModel.createLU(pickedQuantityDTO);
+
+            this.onLoadingEnded();
+        });
     }
 
     public ProdRientroMerceOrderDetailFragment setOnMtbColtClicked(RunnableArgs<MtbColt> onMtbColtClicked) {
@@ -409,9 +407,9 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
 
     public Drawable getUntMisIcon() {
         if (currentOrder.getValue() != null) {
-            if(currentOrder.getValue().getUntOrd().equalsIgnoreCase("KG"))
+            if (currentOrder.getValue().getUntOrd().equalsIgnoreCase("KG"))
                 return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_weight_kg);
-             else
+            else
                 return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_puzzle);
         } else
             return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_weight_kg);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailModule.java
index 2392a0d3..5418fd27 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailModule.java
@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail;
 
 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
@@ -19,8 +20,10 @@ public class ProdRientroMerceOrderDetailModule {
     ProdRientroMerceOrderDetailViewModel provideProdRientroMerceOrderDetailViewModel(
             ProdRientroMerceOrderDetailRESTConsumer prodRientroMerceOrderDetailRESTConsumer,
             ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
-            PrinterRESTConsumer printerRESTConsumer) {
-        return new ProdRientroMerceOrderDetailViewModel(prodRientroMerceOrderDetailRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer);
+            PrinterRESTConsumer printerRESTConsumer,
+            ArticoloRESTConsumer articoloRESTConsumer,
+            SystemRESTConsumer systemRESTConsumer) {
+        return new ProdRientroMerceOrderDetailViewModel(prodRientroMerceOrderDetailRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer, articoloRESTConsumer, systemRESTConsumer);
     }
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java
index 950d8dec..2addcfe5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java
@@ -8,14 +8,16 @@ import it.integry.integrywmsnative.core.model.MtbTCol;
 public class ProdRientroMerceOrderDetailPickedQuantityDTO {
 
     private BigDecimal numCnf;
+    private BigDecimal qtaCnf;
+    private BigDecimal qtaCol;
     private BigDecimal pesoCollo;
     private BigDecimal pesoNetto;
     private BigDecimal taraPed;
     private BigDecimal taraCol;
     private BigDecimal pesoLordo;
+    private String codJfas;
 
     private MtbTCol mtbTCol;
-    private JtbFasi jtbFasi;
 
     public BigDecimal getNumCnf() {
         return numCnf;
@@ -26,6 +28,24 @@ public class ProdRientroMerceOrderDetailPickedQuantityDTO {
         return this;
     }
 
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public BigDecimal getQtaCol() {
+        return qtaCol;
+    }
+
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setQtaCol(BigDecimal qtaCol) {
+        this.qtaCol = qtaCol;
+        return this;
+    }
+
     public BigDecimal getPesoCollo() {
         return pesoCollo;
     }
@@ -71,6 +91,15 @@ public class ProdRientroMerceOrderDetailPickedQuantityDTO {
         return this;
     }
 
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
     public MtbTCol getMtbTCol() {
         return mtbTCol;
     }
@@ -79,13 +108,4 @@ public class ProdRientroMerceOrderDetailPickedQuantityDTO {
         this.mtbTCol = mtbTCol;
         return this;
     }
-
-    public JtbFasi getJtbFasi() {
-        return jtbFasi;
-    }
-
-    public ProdRientroMerceOrderDetailPickedQuantityDTO setJtbFasi(JtbFasi jtbFasi) {
-        this.jtbFasi = jtbFasi;
-        return this;
-    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
index 1c68cd95..1ab63e20 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
@@ -2,22 +2,30 @@ package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail;
 
 import androidx.lifecycle.MutableLiveData;
 
-import com.annimon.stream.Optional;
-import com.annimon.stream.Stream;
+import com.google.gson.reflect.TypeToken;
 
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.model.DtbOrdSteps;
+import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.report.ReportType;
+import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.ProdRientroMerceOrderDetailRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.dto.ImportColliDaProduzioneRequestDTO;
@@ -29,19 +37,25 @@ public class ProdRientroMerceOrderDetailViewModel {
     public final MutableLiveData<List<MtbColt>> mtbColtsOfOrder = new MutableLiveData<>();
     private OrdineLavorazioneDTO currentOrder;
 
-    private final ProdRientroMerceOrderDetailRESTConsumer mProdRientroMerceOrderDetailRESTConsumer;
-    private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
-    private final PrinterRESTConsumer mPrinterRESTConsumer;
+    private final ProdRientroMerceOrderDetailRESTConsumer prodRientroMerceOrderDetailRESTConsumer;
+    private final ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer;
+    private final PrinterRESTConsumer printerRESTConsumer;
+    private final ArticoloRESTConsumer articoloRESTConsumer;
+    private final SystemRESTConsumer systemRESTConsumer;
 
     private Listener mListener;
 
     @Inject
     public ProdRientroMerceOrderDetailViewModel(ProdRientroMerceOrderDetailRESTConsumer prodRientroMerceOrderDetailRESTConsumer,
                                                 ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
-                                                PrinterRESTConsumer printerRESTConsumer) {
-        this.mProdRientroMerceOrderDetailRESTConsumer = prodRientroMerceOrderDetailRESTConsumer;
-        this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
-        this.mPrinterRESTConsumer = printerRESTConsumer;
+                                                PrinterRESTConsumer printerRESTConsumer,
+                                                ArticoloRESTConsumer articoloRESTConsumer,
+                                                SystemRESTConsumer systemRESTConsumer) {
+        this.prodRientroMerceOrderDetailRESTConsumer = prodRientroMerceOrderDetailRESTConsumer;
+        this.colliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
+        this.printerRESTConsumer = printerRESTConsumer;
+        this.articoloRESTConsumer = articoloRESTConsumer;
+        this.systemRESTConsumer = systemRESTConsumer;
     }
 
     public void setOrder(OrdineLavorazioneDTO order) {
@@ -54,7 +68,7 @@ public class ProdRientroMerceOrderDetailViewModel {
         this.sendOnLoadingStarted();
         this.mtbColtsOfOrder.postValue(null);
 
-        this.mProdRientroMerceOrderDetailRESTConsumer.getMtbColtsOfOrder(currentOrder, mtbColts -> {
+        this.prodRientroMerceOrderDetailRESTConsumer.getMtbColtsOfOrder(currentOrder, mtbColts -> {
             for (MtbColt mtbColt : mtbColts) {
                 mtbColt.getMtbColr().get(0)
                         .setDescrizione(currentOrder.getDescrizioneProd())
@@ -66,6 +80,34 @@ public class ProdRientroMerceOrderDetailViewModel {
         }, this::sendError);
     }
 
+    public void retrieveOrderData(RunnableArgss<MtbAart, String> onComplete) {
+        String codProd = currentOrder.getCodProd();
+        articoloRESTConsumer.getByCodMart(codProd, mtbAart -> {
+
+            String sql = "SELECT TOP 1 * " +
+                    "FROM ( " +
+                    "         SELECT MAX(id_step) OVER ( PARTITION BY gestione, num_ord, data_ord) as last_step, " +
+                    "                * " +
+                    "         FROM dtb_ord_steps " +
+                    "         WHERE cod_jfas IS NOT NULL " +
+                    "           AND gestione = " + UtilityDB.valueToString(currentOrder.getGestione()) +
+                    "           AND num_ord = " + UtilityDB.valueToString(currentOrder.getNumOrd()) +
+                    "           AND data_ord = " + UtilityDB.valueToString(currentOrder.getDataOrdD()) +
+                    "     ) tmp " +
+                    "WHERE (data_iniz IS NOT NULL" +
+                    "  AND (data_fine IS NULL OR last_step = id_step))" +
+                    "    OR id_step = 0" +
+                    "ORDER BY id_step DESC";
+
+            systemRESTConsumer.<List<DtbOrdSteps>>processSql(sql, new TypeToken<ArrayList<DtbOrdSteps>>() {
+            }.getType(), dtbOrdStep -> {
+
+                onComplete.run(mtbAart, dtbOrdStep != null && !dtbOrdStep.isEmpty() ? dtbOrdStep.get(0).getCodJfas() : null);
+
+            }, this::sendError);
+        }, this::sendError);
+    }
+
     public void createLU(ProdRientroMerceOrderDetailPickedQuantityDTO pickedQuantityDTO) {
 
         this.sendOnLoadingStarted();
@@ -73,11 +115,10 @@ public class ProdRientroMerceOrderDetailViewModel {
         ImportColliDaProduzioneRequestDTO importColliDaProduzioneRequestDTO =
                 new ImportColliDaProduzioneRequestDTO()
                         .setColliBancale(pickedQuantityDTO.getNumCnf().intValue())
-                        .setQtaCnf(pickedQuantityDTO.getPesoCollo())
-                        .setQtaCol(pickedQuantityDTO.getPesoNetto())
+                        .setQtaCnf(pickedQuantityDTO.getQtaCnf())
+                        .setQtaCol(pickedQuantityDTO.getQtaCol())
                         .setCodJcom(currentOrder.getCodJcom())
-//                        .setCodJfas("OFF")
-                        .setCodJfas(pickedQuantityDTO.getJtbFasi() != null ? pickedQuantityDTO.getJtbFasi().getCodJfas() : null)
+                        .setCodJfas(pickedQuantityDTO.getCodJfas())
                         .setCodMart(currentOrder.getCodProd())
                         .setCodTcol(pickedQuantityDTO.getMtbTCol() != null ? pickedQuantityDTO.getMtbTCol().getCodTcol() : null)
                         .setDataCollo(LocalDate.now())
@@ -87,9 +128,12 @@ public class ProdRientroMerceOrderDetailViewModel {
                         .setPartitaMag(currentOrder.getPartitaMag())
                         .setFornitore(currentOrder.getRagSocAnag())
                         .setPesoLordo(pickedQuantityDTO.getPesoLordo())
-                        .setPesoNetto(pickedQuantityDTO.getPesoNetto());
+                        .setPesoNetto(pickedQuantityDTO.getPesoNetto())
+                        .setAutoGeneraVendita(false);
+
+        this.prodRientroMerceOrderDetailRESTConsumer.importColliDaProduzione(importColliDaProduzioneRequestDTO, mtbColtSaved -> {
+
 
-        this.mProdRientroMerceOrderDetailRESTConsumer.importColloDaProduzione(importColliDaProduzioneRequestDTO, mtbColtSaved -> {
             synchronized (this.mtbColtsOfOrder) {
                 this.mListener.onDataSaved(mtbColtSaved);
             }
@@ -98,29 +142,28 @@ public class ProdRientroMerceOrderDetailViewModel {
 
     }
 
+
     public void deleteLU(MtbColt mtbColt) {
-        new Thread(this::sendOnLoadingStarted).start();
+        this.sendOnLoadingStarted();
 
-        new Thread(() -> {
-            this.mProdRientroMerceOrderDetailRESTConsumer.deleteColloDaProduzione(mtbColt, () -> {
-                synchronized (this.mtbColtsOfOrder) {
-                    Optional<MtbColt> mtbColtToRemove = Stream.of(this.mtbColtsOfOrder.getValue())
-                            .filter(x -> x.getNumCollo().equals(mtbColt.getNumCollo()) &&
-                                    x.getSerCollo().equalsIgnoreCase(mtbColt.getSerCollo()) &&
-                                    x.getDataColloD().compareTo(mtbColt.getDataColloD()) == 0 &&
-                                    x.getGestione().equalsIgnoreCase(mtbColt.getGestione()))
-                            .findFirst();
-
-                    if (mtbColtToRemove.isPresent()) {
-                        this.mtbColtsOfOrder.getValue().remove(mtbColtToRemove.get());
-                        this.mtbColtsOfOrder.postValue(this.mtbColtsOfOrder.getValue());
-                    }
+        this.prodRientroMerceOrderDetailRESTConsumer.deleteColloDaProduzione(mtbColt, () -> {
+            synchronized (this.mtbColtsOfOrder) {
+                Optional<MtbColt> mtbColtToRemove = Objects.requireNonNull(this.mtbColtsOfOrder.getValue()).stream()
+                        .filter(x -> x.getNumCollo().equals(mtbColt.getNumCollo()) &&
+                                x.getSerCollo().equalsIgnoreCase(mtbColt.getSerCollo()) &&
+                                x.getDataColloD().compareTo(mtbColt.getDataColloD()) == 0 &&
+                                x.getGestione().equalsIgnoreCase(mtbColt.getGestione()))
+                        .findFirst();
 
+                if (mtbColtToRemove.isPresent()) {
+                    this.mtbColtsOfOrder.getValue().remove(mtbColtToRemove.get());
+                    this.mtbColtsOfOrder.postValue(this.mtbColtsOfOrder.getValue());
                 }
 
-                this.sendOnLoadingEnded();
-            }, this::sendError);
-        }).start();
+            }
+
+            this.sendOnLoadingEnded();
+        }, this::sendError);
     }
 
     public void setListener(Listener listener) {
@@ -152,7 +195,7 @@ public class ProdRientroMerceOrderDetailViewModel {
     }
 
     private void loadShipmentUlFromProductionUL(MtbColt productionUL, RunnableArgs<MtbColt> onLoad, RunnableArgs<Exception> onError) {
-        this.mColliMagazzinoRESTConsumer.loadShipmentUlFromProductionUL(productionUL, onLoad, onError);
+        this.colliMagazzinoRESTConsumer.loadShipmentUlFromProductionUL(productionUL, onLoad, onError);
     }
 
     private void startPrint(MtbColt mtbColt, ReportType reportType, String codAnag) {
@@ -161,7 +204,7 @@ public class ProdRientroMerceOrderDetailViewModel {
         params.put("ser_collo", mtbColt.getSerCollo());
         params.put("num_collo", mtbColt.getNumCollo());
         params.put("data_collo", UtilityDate.formatDate(mtbColt.getDataColloD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_DASH));
-        this.mPrinterRESTConsumer.printReportType(
+        this.printerRESTConsumer.printReportType(
                 reportType,
                 SettingsManager.i().getUserSession().getDepo().getCodMdep(),
                 codAnag,
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java
index 752a7a33..1b0ed8ae 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java
@@ -8,6 +8,7 @@ import com.orhanobut.logger.Logger;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -108,25 +109,26 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void importColloDaProduzione(ImportColliDaProduzioneRequestDTO importColliDaProduzioneRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public void importColliDaProduzione(ImportColliDaProduzioneRequestDTO importColliDaProduzioneRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         ProdRientroMerceOrderDetailRESTConsumerService service = RESTBuilder.getService(ProdRientroMerceOrderDetailRESTConsumerService.class);
-        service.importColloDaProduzione(importColliDaProduzioneRequestDTO).enqueue(new Callback<ServiceRESTResponse<List<MtbColt>>>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<List<MtbColt>>> call, Response<ServiceRESTResponse<List<MtbColt>>> response) {
-                analyzeAnswer(response, "importColliDaProduzione", mtbColt -> {
-                    onComplete.run(mtbColt.get(0));
-                }, ex -> {
-                    if (onFailed != null) onFailed.run(ex);
-                });
-            }
+        service.importColliDaProduzione(Collections.singletonList(importColliDaProduzioneRequestDTO))
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
+                        analyzeAnswerList(response, "importColliDaProduzione", mtbColt -> {
+                            onComplete.run(mtbColt.get(0));
+                        }, ex -> {
+                            if (onFailed != null) onFailed.run(ex);
+                        });
+                    }
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<List<MtbColt>>> call, Throwable t) {
-                Logger.e(t, "importColliDaProduzione");
-                onFailed.run(new Exception(t));
-            }
-        });
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, Throwable t) {
+                        Logger.e(t, "importColliDaProduzione");
+                        onFailed.run(new Exception(t));
+                    }
+                });
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumerService.java
index fbbf13da..c19f2363 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumerService.java
@@ -13,10 +13,7 @@ public interface ProdRientroMerceOrderDetailRESTConsumerService {
 
 
     @POST("importColliDaProduzioneJson")
-    Call<ServiceRESTResponse<List<MtbColt>>> importColliDaProduzione(@Body List<ImportColliDaProduzioneRequestDTO> importColliDaProduzioneRequestDTO);
-
-    @POST("importColloDaProduzioneJson")
-    Call<ServiceRESTResponse<List<MtbColt>>> importColloDaProduzione(@Body ImportColliDaProduzioneRequestDTO importColloDaProduzioneRequestDTO);
+    Call<ServiceRESTResponse<MtbColt>> importColliDaProduzione(@Body List<ImportColliDaProduzioneRequestDTO> importColliDaProduzioneRequestDTO);
 
     @POST("cancellaColloDaProduzione")
     Call<ServiceRESTResponse<Object>> deleteColloDaProduzione(@Body MtbColt mtbColtToDelete);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/dto/ImportColliDaProduzioneRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/dto/ImportColliDaProduzioneRequestDTO.java
index da274fa6..3d3c321a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/dto/ImportColliDaProduzioneRequestDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/dto/ImportColliDaProduzioneRequestDTO.java
@@ -27,6 +27,8 @@ public class ImportColliDaProduzioneRequestDTO {
     private Integer numRisorse;
     private String annotazioni;
 
+    private boolean autoGeneraVendita;
+
     public String getCodMart() {
         return codMart;
     }
@@ -188,4 +190,13 @@ public class ImportColliDaProduzioneRequestDTO {
         this.annotazioni = annotazioni;
         return this;
     }
+
+    public boolean isAutoGeneraVendita() {
+        return autoGeneraVendita;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setAutoGeneraVendita(boolean autoGeneraVendita) {
+        this.autoGeneraVendita = autoGeneraVendita;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListAdapter.java
index 771d3e03..c26fae46 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListAdapter.java
@@ -32,7 +32,7 @@ public class ProdRientroMerceOrderListAdapter extends SectionedRecyclerViewAdapt
     private View mEmptyView;
 
     private RunnableArgs<String> mOnGroupItemClicked;
-    private RunnableArgs<ProdRientroMerceOrderListModel> mOnItemChecked;
+    private RunnableArgs<ProdRientroMerceOrderListModel> mOnItemClicked;
 
     static class SubheaderHolder extends RecyclerView.ViewHolder {
 
@@ -75,8 +75,8 @@ public class ProdRientroMerceOrderListAdapter extends SectionedRecyclerViewAdapt
         return this;
     }
 
-    public ProdRientroMerceOrderListAdapter setOnItemChecked(RunnableArgs<ProdRientroMerceOrderListModel> onItemChecked) {
-        this.mOnItemChecked = onItemChecked;
+    public ProdRientroMerceOrderListAdapter setOnItemClicked(RunnableArgs<ProdRientroMerceOrderListModel> onItemChecked) {
+        this.mOnItemClicked = onItemChecked;
         return this;
     }
 
@@ -174,7 +174,7 @@ public class ProdRientroMerceOrderListAdapter extends SectionedRecyclerViewAdapt
         holder.mBinding.executePendingBindings();
 
         holder.mBinding.getRoot().setOnClickListener(v -> {
-            if (this.mOnItemChecked != null) this.mOnItemChecked.run(listModel);
+            if (this.mOnItemClicked != null) this.mOnItemClicked.run(listModel);
         });
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java
index c7f835e2..61d4d4af 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java
@@ -84,7 +84,7 @@ public class ProdRientroMerceOrderListFragment extends Fragment {
 
         ProdRientroMerceOrderListAdapter prodRientroMerceOrderListAdapter = new ProdRientroMerceOrderListAdapter(getActivity(), mOrdiniApertiMutableData)
                 .setEmptyView(this.mBindings.emptyView)
-                .setOnItemChecked(x -> {
+                .setOnItemClicked(x -> {
                     if (mOnItemSelectedRunnable != null)
                         mOnItemSelectedRunnable.run(x.getOriginalModel());
                 });
diff --git a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
index a4ba186a..a88e3914 100644
--- a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
@@ -248,7 +248,8 @@
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
                                 android:gravity="end"
-                                android:orientation="horizontal">
+                                android:orientation="horizontal"
+                                android:visibility="@{view.currentOrder.getDataConsCommessaD() == null ? View.GONE : View.VISIBLE}">
 
                                 <androidx.appcompat.widget.LinearLayoutCompat
                                     android:layout_width="wrap_content"
@@ -440,7 +441,8 @@
                                 <androidx.appcompat.widget.LinearLayoutCompat
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:orientation="horizontal">
+                                    android:orientation="horizontal"
+                                    android:visibility="@{view.isOrderColli ? View.GONE : View.VISIBLE}">
 
                                     <androidx.appcompat.widget.AppCompatImageView
                                         android:layout_width="24dp"
@@ -456,8 +458,7 @@
                                         android:layout_height="wrap_content"
                                         android:layout_gravity="center_vertical"
                                         android:gravity="start"
-                                        android:orientation="vertical"
-                                        android:visibility="@{view.isOrderColli ? View.GONE : View.VISIBLE}">
+                                        android:orientation="vertical">
 
                                         <androidx.appcompat.widget.AppCompatTextView
                                             android:layout_width="wrap_content"
@@ -1150,7 +1151,7 @@
                                 android:layout_height="wrap_content"
                                 android:text="@string/add_lu"
                                 app:icon="@drawable/ic_add_24dp"
-                                app:singleClick="@{() -> viewModel.addUL()}" />
+                                app:singleClick="@{() -> view.addULButtonClick()}" />
 
                             <com.google.android.material.button.MaterialButton
                                 style="@style/Button.PrimaryOutline"
@@ -1158,7 +1159,7 @@
                                 android:layout_height="wrap_content"
                                 android:text="@string/add_unit"
                                 app:icon="@drawable/ic_add_24dp"
-                                app:singleClick="@{() -> viewModel.addUnitButtonClick()}" />
+                                app:singleClick="@{() -> view.addSingleUnitButtonClick()}" />
 
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
index e0977529..1294caa5 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
@@ -243,7 +243,8 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:gravity="end"
-                            android:orientation="horizontal">
+                            android:orientation="horizontal"
+                            android:visibility="@{view.currentOrder.getDataConsCommessaD() == null ? View.GONE : View.VISIBLE}">
 
                             <androidx.appcompat.widget.LinearLayoutCompat
                                 android:layout_width="wrap_content"
@@ -435,7 +436,8 @@
                             <androidx.appcompat.widget.LinearLayoutCompat
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:orientation="horizontal">
+                                android:orientation="horizontal"
+                                android:visibility="@{view.isOrderColli ? View.GONE : View.VISIBLE}">
 
                                 <androidx.appcompat.widget.AppCompatImageView
                                     android:layout_width="24dp"
@@ -451,8 +453,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="center_vertical"
                                     android:gravity="start"
-                                    android:orientation="vertical"
-                                    android:visibility="@{view.isOrderColli ? View.GONE : View.VISIBLE}">
+                                    android:orientation="vertical">
 
                                     <androidx.appcompat.widget.AppCompatTextView
                                         android:layout_width="wrap_content"
@@ -731,7 +732,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/add_lu"
                             app:icon="@drawable/ic_add_24dp"
-                            app:singleClick="@{() -> viewModel.addUL()}" />
+                            app:singleClick="@{() -> view.addULButtonClick()}" />
 
                         <com.google.android.material.button.MaterialButton
                             style="@style/Button.PrimaryOutline"
@@ -739,7 +740,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/add_unit"
                             app:icon="@drawable/ic_add_24dp"
-                            app:singleClick="@{() -> viewModel.addUnitButtonClick()}" />
+                            app:singleClick="@{() -> view.addSingleUnitButtonClick()}" />
 
 
                     </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 84b76379..d35c3e34 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -334,7 +334,7 @@
     <string name="general">Generale</string>
     <string name="purchase">Acquisti</string>
     <string name="checkout">Vendita</string>
-    <string name="manufacture">Lav. terzi / Trasf. interni</string>
+    <string name="manufacture">Produzione</string>
     <string name="production">Produzione</string>
     <string name="production_line">Linea di produzione</string>
     <string name="select_batch_lot">Seleziona un lotto</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7445fae1..031c5d90 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -338,7 +338,7 @@
     <string name="general">General</string>
     <string name="purchase">Purchase</string>
     <string name="checkout">Check out</string>
-    <string name="manufacture">Manufacture / Internal movement</string>
+    <string name="manufacture">Manufacture</string>
     <string name="production">Production</string>
     <string name="production_line">Production line</string>
     <string name="select_batch_lot">Select a batch lot</string>
diff --git a/build.gradle b/build.gradle
index 3a832b4c..f2c2bbf7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.20'
-        agp_version = '8.4.0'
+        agp_version = '8.7.2'
     }
 
     repositories {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 69d0c2a3..af8dff6c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Feb 13 15:14:43 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From 342753aeaca3515b0c72e5bdc4d3f5641420c89b Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 5 Nov 2024 11:23:51 +0100
Subject: [PATCH 043/103] Migliorata gestione del loading dialog (evitate
 concorrenze di apertura)

---
 .../core/expansion/BaseActivity.java          | 28 ++++++++-----------
 .../core/expansion/BaseDialogFragment.java    | 27 +++++++++---------
 .../core/expansion/BaseFragment.java          | 19 ++++---------
 .../PickingLiberoViewModel.java               |  4 +--
 .../PVOrdiniAcquistoGrigliaFragment.java      |  5 +---
 .../gest/settings/MainSettingsFragment.java   | 19 +++++--------
 .../view/dialogs/DialogProgressView.java      | 21 ++++++++++++--
 .../ask_cliente/DialogAskClienteView.java     |  2 +-
 8 files changed, 60 insertions(+), 65 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
index 448b2349..7fbc2ab9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
@@ -6,6 +6,8 @@ import android.view.KeyEvent;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import java.util.concurrent.ExecutorService;
+
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.MainApplication;
@@ -18,7 +20,8 @@ public class BaseActivity extends AppCompatActivity {
     @Inject
     public DialogProgressView mCurrentProgress;
 
-    private boolean progressOpened;
+    @Inject
+    public ExecutorService executorService;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -47,28 +50,19 @@ public class BaseActivity extends AppCompatActivity {
     }
 
 
+
     private void openProgress() {
         BarcodeManager.disable();
-        if (!progressOpened && !this.mCurrentProgress.isAdded() && !this.mCurrentProgress.isInLayout()) {
-            this.progressOpened = true;
-            runOnUiThread(() -> {
-                try {
-                    this.mCurrentProgress.show(getSupportFragmentManager(), "tag");
-                } catch (IllegalStateException ise) {
-                    //ignored
-                }
-            });
-        }
+        executorService.execute(() -> {
+            this.mCurrentProgress.show(getSupportFragmentManager());
+        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        if (progressOpened) {
-            this.progressOpened = false;
-            runOnUiThread(() -> {
-                mCurrentProgress.dismiss();
-            });
-        }
+        executorService.execute(() -> {
+            mCurrentProgress.dismissAllowingStateLoss();
+        });
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
index 34c53671..8a426227 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
@@ -13,6 +13,8 @@ import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
+import java.util.concurrent.ExecutorService;
+
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.MainApplication;
@@ -24,7 +26,9 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
 
     @Inject
     public DialogProgressView mCurrentProgress;
-    private boolean progressOpened;
+
+    @Inject
+    public ExecutorService executorService;
 
     private boolean mBarcodeListener = false;
 
@@ -70,22 +74,19 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
         BarcodeManager.enable();
     }
 
+
     private void openProgress() {
-        if (!progressOpened && !this.mCurrentProgress.isAdded() && !this.mCurrentProgress.isInLayout()) {
-            this.progressOpened = true;
-            requireActivity().runOnUiThread(() -> {
-                this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
-            });
-        }
+        BarcodeManager.disable();
+        executorService.execute(() -> {
+            this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
+        });
     }
 
     private void closeProgress() {
-        if (progressOpened) {
-            this.progressOpened = false;
-            requireActivity().runOnUiThread(() -> {
-                mCurrentProgress.dismiss();
-            });
-        }
+        BarcodeManager.enable();
+        executorService.execute(() -> {
+            mCurrentProgress.dismissAllowingStateLoss();
+        });
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
index 5423d71e..78c75012 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
@@ -33,7 +33,6 @@ public abstract class BaseFragment extends Fragment {
     protected ElevatedToolbar mToolbar;
 
     protected final List<Runnable> mOnPreDestroyList = new ArrayList<>();
-    private boolean progressOpened;
 
 
     public void setScrollToolbar(ElevatedToolbar toolbar) {
@@ -67,22 +66,16 @@ public abstract class BaseFragment extends Fragment {
 
     private void openProgress() {
         BarcodeManager.disable();
-        if (!progressOpened && !this.mCurrentProgress.isAdded() && !this.mCurrentProgress.isInLayout()) {
-            this.progressOpened = true;
-            executorService.execute(() -> {
-                this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
-            });
-        }
+        executorService.execute(() -> {
+            this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
+        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        if (progressOpened) {
-            this.progressOpened = false;
-            executorService.execute(() -> {
-                mCurrentProgress.dismissAllowingStateLoss();
-            });
-        }
+        executorService.execute(() -> {
+            mCurrentProgress.dismissAllowingStateLoss();
+        });
     }
 
     public void onError(Exception ex) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
index 8ea43452..0e48affd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
@@ -329,9 +329,7 @@ public class PickingLiberoViewModel {
             this.sendLULineaProdRequired(response -> {
                 createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, response.getPosizione(), response.getIdLotto(), onComplete);
 
-            }, () -> {
-                this.sendOnLoadingEnded();
-            });
+            }, this::sendOnLoadingEnded);
         } else {
             createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, null, null, onComplete);
         }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java
index c2f844f9..f136e32e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java
@@ -88,10 +88,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends BaseFragment implements ITi
     }
 
     public static PVOrdiniAcquistoGrigliaFragment newInstance() {
-        PVOrdiniAcquistoGrigliaFragment fragment = new PVOrdiniAcquistoGrigliaFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
+        return new PVOrdiniAcquistoGrigliaFragment();
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
index 5590dbd4..71d6f300 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
@@ -307,22 +307,17 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
     }
 
 
+
     private void openProgress() {
-        if (!progressOpened && !this.mCurrentProgress.isAdded()) {
-            this.progressOpened = true;
-            requireActivity().runOnUiThread(() -> {
-                this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
-            });
-        }
+        executorService.execute(() -> {
+            this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
+        });
     }
 
     private void closeProgress() {
-        if (progressOpened) {
-            this.progressOpened = false;
-            requireActivity().runOnUiThread(() -> {
-                mCurrentProgress.dismiss();
-            });
-        }
+        executorService.execute(() -> {
+            mCurrentProgress.dismissAllowingStateLoss();
+        });
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
index 6ec042e1..0d33ce4c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
@@ -3,11 +3,11 @@ package it.integry.integrywmsnative.view.dialogs;
 import android.app.Dialog;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
@@ -26,6 +26,8 @@ public class DialogProgressView extends DialogFragment {
     private String subtitle;
     private boolean indeterminateProgress;
 
+    private boolean progressOpened;
+
     public static DialogProgressView newInstance(String title, String subtitle, boolean indeterminate) {
         return new DialogProgressView(title, subtitle, indeterminate);
     }
@@ -43,7 +45,7 @@ public class DialogProgressView extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        mBindings = DialogProgressBinding.inflate(LayoutInflater.from(requireContext()));
+        mBindings = DialogProgressBinding.inflate(getLayoutInflater());
 
         mBindings.setTitle(UtilityString.isNullOrEmpty(title) ? requireContext().getString(R.string.loading) : title);
         if (!UtilityString.isNullOrEmpty(subtitle)) mBindings.setSubtitle(subtitle);
@@ -61,6 +63,21 @@ public class DialogProgressView extends DialogFragment {
         return alertDialog;
     }
 
+    public void show(@NonNull FragmentManager manager) {
+        if (!progressOpened && !isAdded() && !isInLayout()) {
+            this.progressOpened = true;
+            super.show(manager, "loading-dialog");
+        }
+    }
+
+    @Override
+    public void dismiss() {
+        if (progressOpened) {
+            this.progressOpened = false;
+            super.dismissAllowingStateLoss();
+        }
+    }
+
     public String getTitle() {
         return title;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java
index 22491d4f..42ceaa18 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java
@@ -145,7 +145,7 @@ public class DialogAskClienteView extends BaseDialogFragment {
         viewModel2.setOnAbortClickListener(this::dismiss);
 
 
-        this.dialogProgressView.show(this.getParentFragmentManager(), "tag");
+        this.dialogProgressView.show(this.getParentFragmentManager());
 
         this.initClienti(viewModel1, () -> {
             this.initDestinatari(viewModel2, () -> {

From 95a51ecc7a1da25119408a76abac114776a1e1f7 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 5 Nov 2024 11:24:39 +0100
Subject: [PATCH 044/103] -> v1.41.03 (451)

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

diff --git a/app/build.gradle b/app/build.gradle
index abb785f3..4b483430 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 450
-    def appVersionName = '1.41.02'
+    def appVersionCode = 451
+    def appVersionName = '1.41.03'
 
     signingConfigs {
         release {

From 482243ceff09cad7bcd90683c3e71fda43f1ee6d Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 14 Nov 2024 09:58:40 +0100
Subject: [PATCH 045/103] Implementato CaricoProdFin in Rientro Merce

---
 .../MainApplicationModule.java                |   7 +
 .../consumers/ProduzioneRESTConsumer.java     |  41 ++
 .../ProduzioneRESTConsumerService.java        |  15 +
 .../model/produzione/CaricoProdFinDTO.java    | 363 ++++++++++++++++++
 .../produzione/CaricoProdFinProdottiDTO.java  |  18 +
 .../produzione/CaricoProdFinProdottoDTO.java  |  87 +++++
 .../core/utility/UtilityDB.java               |   8 +-
 .../filters/FilterCodArtLayoutView.java       |   5 +-
 .../ProdFabbisognoLineeProdFragment.java      |  13 +-
 .../ProdFabbisognoLineeProdViewModel.java     |   9 +-
 .../dto/ProdFabbisognoLineeProdDTO.java       |  14 +-
 .../ProdRientroMerceOrderDetailFragment.java  |   2 -
 .../ProdRientroMerceOrderDetailModule.java    |   6 +-
 .../ProdRientroMerceOrderDetailViewModel.java |  54 ++-
 ...odRientroMerceOrderDetailRESTConsumer.java |   2 +-
 .../ImportColliDaProduzioneRequestDTO.java    |   7 +-
 .../ProdRientroMerceOrderListFragment.java    |   3 +-
 .../ProdVersamentoMaterialeFragment.java      |   2 +-
 .../dto/OrdineLavorazioneDTO.java             |  13 +-
 .../gest/spedizione/SpedizioneActivity.java   |   9 +-
 .../gest/spedizione/SpedizioneViewModel.java  |  24 +-
 .../view/dialogs/DialogProgressView.java      |   4 +-
 .../DialogChooseArtFromListaArtsView.java     |   6 +-
 ...agment_prod_rientro_merce_order_detail.xml |   2 +-
 ...agment_prod_rientro_merce_order_detail.xml |   2 +-
 25 files changed, 649 insertions(+), 67 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumer.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumerService.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/produzione/CaricoProdFinDTO.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/produzione/CaricoProdFinProdottiDTO.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/produzione/CaricoProdFinProdottoDTO.java

diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
index a8d6cc90..21c99a0c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
@@ -42,6 +42,7 @@ import it.integry.integrywmsnative.core.rest.consumers.PVOrdiniAcquistoRESTConsu
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ProductionLinesRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ProduzioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.VettoriRESTConsumer;
 import it.integry.integrywmsnative.core.services.inventario.InventarioService;
@@ -205,6 +206,12 @@ public class MainApplicationModule {
         return new AziendaRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    ProduzioneRESTConsumer provideProduzioneRESTConsumer() {
+        return new ProduzioneRESTConsumer();
+    }
+
     @Provides
     @Singleton
     BarcodeRESTConsumer provideBarcodeRESTConsumer(Ean128Service ean128Service) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumer.java
new file mode 100644
index 00000000..0efd676c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumer.java
@@ -0,0 +1,41 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import com.orhanobut.logger.Logger;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.produzione.CaricoProdFinDTO;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+@Singleton
+public class ProduzioneRESTConsumer extends _BaseRESTConsumer{
+
+
+
+
+    public void caricoProdFin(CaricoProdFinDTO caricoProdFin, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+
+        ProduzioneRESTConsumerService service = RESTBuilder.getService(ProduzioneRESTConsumerService.class);
+        service.caricoProdFin(caricoProdFin)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "caricoProdFin", Void -> onComplete.run(), ex -> {
+                            if (onFailed != null) onFailed.run(ex);
+                        });
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
+                        Logger.e(t, "caricoProdFin");
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumerService.java
new file mode 100644
index 00000000..b7501cf0
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumerService.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.produzione.CaricoProdFinDTO;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.POST;
+
+public interface ProduzioneRESTConsumerService {
+
+
+    @POST("caricoProdFinJson")
+    Call<ServiceRESTResponse<Void>> caricoProdFin(@Body CaricoProdFinDTO caricoProdFin);
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/produzione/CaricoProdFinDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/produzione/CaricoProdFinDTO.java
new file mode 100644
index 00000000..d66d0e80
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/produzione/CaricoProdFinDTO.java
@@ -0,0 +1,363 @@
+package it.integry.integrywmsnative.core.rest.model.produzione;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+public class CaricoProdFinDTO {
+
+    private CaricoProdFinProdottiDTO prodotti = new CaricoProdFinProdottiDTO();
+    private String gestione;
+    private String effettuaScaricoMateriali;
+    private String effettuaCaricoProdotto;
+    private String codAnag;
+    private String codMdep;
+    private String codMdepScar;
+    private String codDtipCar;
+    private String codDtipScar;
+    private String codDtipRien;
+    private String terminaLavorazione;
+    private String serDoc;
+    private String aggiornaStato;
+    private String creaCollo;
+    private String creaScaricoDaColloVers;
+    private String creaCaricoDaCollo;
+    private String creaScaricoDaCollo;
+    private String creaColloVersDaColloCarico;
+    private String creaRientroDaCollo;
+    private Integer numOrd;
+    private Integer idRiga;
+    private Integer idStep;
+    private LocalDate dataOrd;
+    private LocalDate dataProd;
+    private LocalDate dataDoc;
+    private Integer numDoc;
+    private LocalDateTime dataVersamento;
+    private String preparatoDa;
+    private String generateJson; /*24/01/2022(FABIO): da eliminare non appena abbiamo testato il salvataggio diretto con entity passo per passo*/
+    private String codJfas;
+    private String terminaLavorazioneLinea;
+    private String activityID;
+    private Integer idLotto;
+    private boolean escludiArticoliGestitiDaWmsInScarico;
+
+    public CaricoProdFinProdottiDTO getProdotti() {
+        return prodotti;
+    }
+
+    public CaricoProdFinDTO setProdotti(CaricoProdFinProdottiDTO prodotti) {
+        this.prodotti = prodotti;
+        return this;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public CaricoProdFinDTO setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
+
+    public String getEffettuaScaricoMateriali() {
+        return effettuaScaricoMateriali;
+    }
+
+    public CaricoProdFinDTO setEffettuaScaricoMateriali(String effettuaScaricoMateriali) {
+        this.effettuaScaricoMateriali = effettuaScaricoMateriali;
+        return this;
+    }
+
+    public CaricoProdFinDTO setEffettuaScaricoMateriali(boolean effettuaScaricoMateriali) {
+        this.effettuaScaricoMateriali = effettuaScaricoMateriali ? "S" : "N";
+        return this;
+    }
+
+    public String getEffettuaCaricoProdotto() {
+        return effettuaCaricoProdotto;
+    }
+
+    public CaricoProdFinDTO setEffettuaCaricoProdotto(String effettuaCaricoProdotto) {
+        this.effettuaCaricoProdotto = effettuaCaricoProdotto;
+        return this;
+    }
+
+    public CaricoProdFinDTO setEffettuaCaricoProdotto(boolean effettuaCaricoProdotto) {
+        this.effettuaCaricoProdotto = effettuaCaricoProdotto ? "S" : "N";
+        return this;
+    }
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public CaricoProdFinDTO setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+        return this;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public CaricoProdFinDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public String getCodMdepScar() {
+        return codMdepScar;
+    }
+
+    public CaricoProdFinDTO setCodMdepScar(String codMdepScar) {
+        this.codMdepScar = codMdepScar;
+        return this;
+    }
+
+    public String getCodDtipCar() {
+        return codDtipCar;
+    }
+
+    public CaricoProdFinDTO setCodDtipCar(String codDtipCar) {
+        this.codDtipCar = codDtipCar;
+        return this;
+    }
+
+    public String getCodDtipScar() {
+        return codDtipScar;
+    }
+
+    public CaricoProdFinDTO setCodDtipScar(String codDtipScar) {
+        this.codDtipScar = codDtipScar;
+        return this;
+    }
+
+    public String getCodDtipRien() {
+        return codDtipRien;
+    }
+
+    public CaricoProdFinDTO setCodDtipRien(String codDtipRien) {
+        this.codDtipRien = codDtipRien;
+        return this;
+    }
+
+    public String getTerminaLavorazione() {
+        return terminaLavorazione;
+    }
+
+    public CaricoProdFinDTO setTerminaLavorazione(String terminaLavorazione) {
+        this.terminaLavorazione = terminaLavorazione;
+        return this;
+    }
+
+    public String getSerDoc() {
+        return serDoc;
+    }
+
+    public CaricoProdFinDTO setSerDoc(String serDoc) {
+        this.serDoc = serDoc;
+        return this;
+    }
+
+    public String getAggiornaStato() {
+        return aggiornaStato;
+    }
+
+    public CaricoProdFinDTO setAggiornaStato(String aggiornaStato) {
+        this.aggiornaStato = aggiornaStato;
+        return this;
+    }
+
+    public String getCreaCollo() {
+        return creaCollo;
+    }
+
+    public CaricoProdFinDTO setCreaCollo(String creaCollo) {
+        this.creaCollo = creaCollo;
+        return this;
+    }
+
+    public String getCreaScaricoDaColloVers() {
+        return creaScaricoDaColloVers;
+    }
+
+    public CaricoProdFinDTO setCreaScaricoDaColloVers(String creaScaricoDaColloVers) {
+        this.creaScaricoDaColloVers = creaScaricoDaColloVers;
+        return this;
+    }
+
+    public String getCreaCaricoDaCollo() {
+        return creaCaricoDaCollo;
+    }
+
+    public CaricoProdFinDTO setCreaCaricoDaCollo(String creaCaricoDaCollo) {
+        this.creaCaricoDaCollo = creaCaricoDaCollo;
+        return this;
+    }
+
+    public CaricoProdFinDTO setCreaCaricoDaCollo(boolean creaCaricoDaCollo) {
+        this.creaCaricoDaCollo = creaCaricoDaCollo ? "S" : "N";
+        return this;
+    }
+
+    public String getCreaScaricoDaCollo() {
+        return creaScaricoDaCollo;
+    }
+
+    public CaricoProdFinDTO setCreaScaricoDaCollo(String creaScaricoDaCollo) {
+        this.creaScaricoDaCollo = creaScaricoDaCollo;
+        return this;
+    }
+
+    public String getCreaColloVersDaColloCarico() {
+        return creaColloVersDaColloCarico;
+    }
+
+    public CaricoProdFinDTO setCreaColloVersDaColloCarico(String creaColloVersDaColloCarico) {
+        this.creaColloVersDaColloCarico = creaColloVersDaColloCarico;
+        return this;
+    }
+
+    public String getCreaRientroDaCollo() {
+        return creaRientroDaCollo;
+    }
+
+    public CaricoProdFinDTO setCreaRientroDaCollo(String creaRientroDaCollo) {
+        this.creaRientroDaCollo = creaRientroDaCollo;
+        return this;
+    }
+
+    public Integer getNumOrd() {
+        return numOrd;
+    }
+
+    public CaricoProdFinDTO setNumOrd(Integer numOrd) {
+        this.numOrd = numOrd;
+        return this;
+    }
+
+    public Integer getIdRiga() {
+        return idRiga;
+    }
+
+    public CaricoProdFinDTO setIdRiga(Integer idRiga) {
+        this.idRiga = idRiga;
+        return this;
+    }
+
+    public Integer getIdStep() {
+        return idStep;
+    }
+
+    public CaricoProdFinDTO setIdStep(Integer idStep) {
+        this.idStep = idStep;
+        return this;
+    }
+
+    public LocalDate getDataOrd() {
+        return dataOrd;
+    }
+
+    public CaricoProdFinDTO setDataOrd(LocalDate dataOrd) {
+        this.dataOrd = dataOrd;
+        return this;
+    }
+
+    public LocalDate getDataProd() {
+        return dataProd;
+    }
+
+    public CaricoProdFinDTO setDataProd(LocalDate dataProd) {
+        this.dataProd = dataProd;
+        return this;
+    }
+
+    public LocalDate getDataDoc() {
+        return dataDoc;
+    }
+
+    public CaricoProdFinDTO setDataDoc(LocalDate dataDoc) {
+        this.dataDoc = dataDoc;
+        return this;
+    }
+
+    public Integer getNumDoc() {
+        return numDoc;
+    }
+
+    public CaricoProdFinDTO setNumDoc(Integer numDoc) {
+        this.numDoc = numDoc;
+        return this;
+    }
+
+    public LocalDateTime getDataVersamento() {
+        return dataVersamento;
+    }
+
+    public CaricoProdFinDTO setDataVersamento(LocalDateTime dataVersamento) {
+        this.dataVersamento = dataVersamento;
+        return this;
+    }
+
+    public String getPreparatoDa() {
+        return preparatoDa;
+    }
+
+    public CaricoProdFinDTO setPreparatoDa(String preparatoDa) {
+        this.preparatoDa = preparatoDa;
+        return this;
+    }
+
+    public String getGenerateJson() {
+        return generateJson;
+    }
+
+    public CaricoProdFinDTO setGenerateJson(String generateJson) {
+        this.generateJson = generateJson;
+        return this;
+    }
+
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public CaricoProdFinDTO setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
+    public String getTerminaLavorazioneLinea() {
+        return terminaLavorazioneLinea;
+    }
+
+    public CaricoProdFinDTO setTerminaLavorazioneLinea(String terminaLavorazioneLinea) {
+        this.terminaLavorazioneLinea = terminaLavorazioneLinea;
+        return this;
+    }
+
+    public String getActivityID() {
+        return activityID;
+    }
+
+    public CaricoProdFinDTO setActivityID(String activityID) {
+        this.activityID = activityID;
+        return this;
+    }
+
+    public Integer getIdLotto() {
+        return idLotto;
+    }
+
+    public CaricoProdFinDTO setIdLotto(Integer idLotto) {
+        this.idLotto = idLotto;
+        return this;
+    }
+
+    public boolean isEscludiArticoliGestitiDaWmsInScarico() {
+        return escludiArticoliGestitiDaWmsInScarico;
+    }
+
+    public CaricoProdFinDTO setEscludiArticoliGestitiDaWmsInScarico(boolean escludiArticoliGestitiDaWmsInScarico) {
+        this.escludiArticoliGestitiDaWmsInScarico = escludiArticoliGestitiDaWmsInScarico;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/produzione/CaricoProdFinProdottiDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/produzione/CaricoProdFinProdottiDTO.java
new file mode 100644
index 00000000..5c8ad6f5
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/produzione/CaricoProdFinProdottiDTO.java
@@ -0,0 +1,18 @@
+package it.integry.integrywmsnative.core.rest.model.produzione;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CaricoProdFinProdottiDTO {
+
+    private List<CaricoProdFinProdottoDTO> row = new ArrayList<>();
+
+    public List<CaricoProdFinProdottoDTO> getRow() {
+        return row;
+    }
+
+    public CaricoProdFinProdottiDTO setRow(List<CaricoProdFinProdottoDTO> row) {
+        this.row = row;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/produzione/CaricoProdFinProdottoDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/produzione/CaricoProdFinProdottoDTO.java
new file mode 100644
index 00000000..384f98c7
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/produzione/CaricoProdFinProdottoDTO.java
@@ -0,0 +1,87 @@
+package it.integry.integrywmsnative.core.rest.model.produzione;
+
+import java.math.BigDecimal;
+
+public class CaricoProdFinProdottoDTO {
+
+    private String partitaMag;
+    private String flagDig;
+    private String codTcol;
+    private BigDecimal qtaProdAna;
+    private BigDecimal qtaProdDig;
+    private BigDecimal qtaCnf;
+    private BigDecimal numCart;
+    private BigDecimal tara;
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public CaricoProdFinProdottoDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public String getFlagDig() {
+        return flagDig;
+    }
+
+    public CaricoProdFinProdottoDTO setFlagDig(String flagDig) {
+        this.flagDig = flagDig;
+        return this;
+    }
+
+    public String getCodTcol() {
+        return codTcol;
+    }
+
+    public CaricoProdFinProdottoDTO setCodTcol(String codTcol) {
+        this.codTcol = codTcol;
+        return this;
+    }
+
+    public BigDecimal getQtaProdAna() {
+        return qtaProdAna;
+    }
+
+    public CaricoProdFinProdottoDTO setQtaProdAna(BigDecimal qtaProdAna) {
+        this.qtaProdAna = qtaProdAna;
+        return this;
+    }
+
+    public BigDecimal getQtaProdDig() {
+        return qtaProdDig;
+    }
+
+    public CaricoProdFinProdottoDTO setQtaProdDig(BigDecimal qtaProdDig) {
+        this.qtaProdDig = qtaProdDig;
+        return this;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public CaricoProdFinProdottoDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public BigDecimal getNumCart() {
+        return numCart;
+    }
+
+    public CaricoProdFinProdottoDTO setNumCart(BigDecimal numCart) {
+        this.numCart = numCart;
+        return this;
+    }
+
+    public BigDecimal getTara() {
+        return tara;
+    }
+
+    public CaricoProdFinProdottoDTO setTara(BigDecimal tara) {
+        this.tara = tara;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDB.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDB.java
index 5aa577b8..ae385fc0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDB.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDB.java
@@ -4,7 +4,7 @@ import com.annimon.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
 
-import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -25,9 +25,13 @@ public class UtilityDB {
                 } else {
                     valueString = "'" + valueString.replaceAll("'","''") + "'";
                 }
-            } else if (value instanceof Date){
 
+            } else if (value instanceof Date){
                 valueString = "'" + UtilityDate.formatDate((Date) value, UtilityDate.COMMONS_DATE_FORMATS.YMD_DASH) + "'";
+
+            } else if (value instanceof LocalDate){
+                valueString = "'" + UtilityDate.formatDate((LocalDate) value, UtilityDate.COMMONS_DATE_FORMATS.YMD_DASH) + "'";
+
             } else if (value instanceof Integer) {
 
             } else {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/filters/FilterCodArtLayoutView.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/filters/FilterCodArtLayoutView.java
index 6a53e10c..e87552f7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/filters/FilterCodArtLayoutView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/filters/FilterCodArtLayoutView.java
@@ -18,6 +18,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import it.integry.integrywmsnative.BR;
 import it.integry.integrywmsnative.R;
@@ -48,10 +49,10 @@ public class FilterCodArtLayoutView extends FilterLayoutView {
         refreshList();
 
         this.setSearchView(this.mBindings.searchView, newFilter -> {
-            hidden = Stream.of(all)
+            hidden = all.stream()
                     .filter(x -> !x.toUpperCase(Locale.ROOT).contains(newFilter.toUpperCase(Locale.ROOT)) &&
                             !x.toUpperCase(Locale.ROOT).contains(newFilter.toUpperCase(Locale.ROOT)))
-                    .toList();
+                    .collect(Collectors.toList());
 
             refreshList();
         });
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java
index 45eb774c..417e1364 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java
@@ -17,6 +17,7 @@ import com.annimon.stream.Stream;
 import com.ravikoradiya.liveadapter.LiveAdapter;
 import com.ravikoradiya.liveadapter.Type;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -390,16 +391,16 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
                 .map(x -> ((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getNumOrd().toString())
                 .toList());
 
-        Date dataInizio = Stream.of(mProdFabbisognoItemModel)
+        LocalDate dataInizio = Stream.of(mProdFabbisognoItemModel)
                 .filter(x -> x instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) x).selected.get())
-                .map(x -> ((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getDataOrdD())
-                .min(Date::compareTo)
+                .map(x -> ((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getDataOrd())
+                .min(Comparator.naturalOrder())
                 .orElse(null);
 
-        Date dataFine = Stream.of(mProdFabbisognoItemModel)
+        LocalDate dataFine = Stream.of(mProdFabbisognoItemModel)
                 .filter(x -> x instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) x).selected.get())
-                .map(x -> ((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getDataOrdD())
-                .max(Date::compareTo)
+                .map(x -> ((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getDataOrd())
+                .max(Comparator.naturalOrder())
                 .orElse(null);
 
         List<MtbGrup> listMtbGrup = Stream.of(mProdFabbisognoItemModel)
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java
index f3f8a1a7..c3a41823 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java
@@ -5,23 +5,18 @@ import androidx.lifecycle.MutableLiveData;
 
 import com.annimon.stream.Stream;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.List;
 
-import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
-import it.integry.integrywmsnative.core.exception.NoOrdersScheduledException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.GroupTitleModel;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeItemModelDto;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
-import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 
 public class ProdFabbisognoLineeProdViewModel {
 
@@ -66,7 +61,7 @@ public class ProdFabbisognoLineeProdViewModel {
         return ordiniList;
     }
 
-    public void loadFabbisogno(String ordini, String codMdep, Date dataInizio, Date dataFine, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete) {
+    public void loadFabbisogno(String ordini, String codMdep, LocalDate dataInizio, LocalDate dataFine, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete) {
         this.sendOnLoadingStarted();
 
         this.mProdFabbisognoLineeProdRESTConsumer.loadFabbisogno(ordini, codMdep, jtbFasi -> {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeProdDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeProdDTO.java
index e36bc238..92a96333 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeProdDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeProdDTO.java
@@ -1,7 +1,7 @@
 package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
 
 public class ProdFabbisognoLineeProdDTO {
 
@@ -14,8 +14,8 @@ public class ProdFabbisognoLineeProdDTO {
     private BigDecimal numCnfVersata;
     private BigDecimal qtaFabbisogno;
     private BigDecimal numCnfFabbisogno;
-    private Date dataInizio;
-    private Date dataFine;
+    private LocalDate dataInizio;
+    private LocalDate dataFine;
     private String codMgrp;
     private String descrizioneMgrp;
     private String codMsgr;
@@ -105,20 +105,20 @@ public class ProdFabbisognoLineeProdDTO {
         return this;
     }
 
-    public Date getDataInizio() {
+    public LocalDate getDataInizio() {
         return dataInizio;
     }
 
-    public ProdFabbisognoLineeProdDTO setDataInizio(Date dataInizio) {
+    public ProdFabbisognoLineeProdDTO setDataInizio(LocalDate dataInizio) {
         this.dataInizio = dataInizio;
         return this;
     }
 
-    public Date getDataFine() {
+    public LocalDate getDataFine() {
         return dataFine;
     }
 
-    public ProdFabbisognoLineeProdDTO setDataFine(Date dataFine) {
+    public ProdFabbisognoLineeProdDTO setDataFine(LocalDate dataFine) {
         this.dataFine = dataFine;
         return this;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
index b37b47a6..e737c161 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
@@ -336,8 +336,6 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
 
 
             this.mViewModel.createLU(pickedQuantityDTO);
-
-            this.onLoadingEnded();
         });
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailModule.java
index 5418fd27..2c3f8889 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailModule.java
@@ -5,6 +5,7 @@ import dagger.Provides;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ProduzioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.ProdRientroMerceOrderDetailRESTConsumer;
 
@@ -22,8 +23,9 @@ public class ProdRientroMerceOrderDetailModule {
             ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
             PrinterRESTConsumer printerRESTConsumer,
             ArticoloRESTConsumer articoloRESTConsumer,
-            SystemRESTConsumer systemRESTConsumer) {
-        return new ProdRientroMerceOrderDetailViewModel(prodRientroMerceOrderDetailRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer, articoloRESTConsumer, systemRESTConsumer);
+            SystemRESTConsumer systemRESTConsumer,
+            ProduzioneRESTConsumer produzioneRESTConsumer) {
+        return new ProdRientroMerceOrderDetailViewModel(prodRientroMerceOrderDetailRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer, articoloRESTConsumer, systemRESTConsumer, produzioneRESTConsumer);
     }
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
index 1ab63e20..96837a25 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
@@ -23,7 +23,10 @@ import it.integry.integrywmsnative.core.report.ReportType;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ProduzioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.produzione.CaricoProdFinDTO;
+import it.integry.integrywmsnative.core.rest.model.produzione.CaricoProdFinProdottoDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -42,6 +45,7 @@ public class ProdRientroMerceOrderDetailViewModel {
     private final PrinterRESTConsumer printerRESTConsumer;
     private final ArticoloRESTConsumer articoloRESTConsumer;
     private final SystemRESTConsumer systemRESTConsumer;
+    private final ProduzioneRESTConsumer produzioneRESTConsumer;
 
     private Listener mListener;
 
@@ -50,12 +54,14 @@ public class ProdRientroMerceOrderDetailViewModel {
                                                 ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
                                                 PrinterRESTConsumer printerRESTConsumer,
                                                 ArticoloRESTConsumer articoloRESTConsumer,
-                                                SystemRESTConsumer systemRESTConsumer) {
+                                                SystemRESTConsumer systemRESTConsumer,
+                                                ProduzioneRESTConsumer produzioneRESTConsumer) {
         this.prodRientroMerceOrderDetailRESTConsumer = prodRientroMerceOrderDetailRESTConsumer;
         this.colliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
         this.printerRESTConsumer = printerRESTConsumer;
         this.articoloRESTConsumer = articoloRESTConsumer;
         this.systemRESTConsumer = systemRESTConsumer;
+        this.produzioneRESTConsumer = produzioneRESTConsumer;
     }
 
     public void setOrder(OrdineLavorazioneDTO order) {
@@ -65,7 +71,7 @@ public class ProdRientroMerceOrderDetailViewModel {
     }
 
     public void refreshMtbColts() {
-        this.sendOnLoadingStarted();
+        //this.sendOnLoadingStarted();
         this.mtbColtsOfOrder.postValue(null);
 
         this.prodRientroMerceOrderDetailRESTConsumer.getMtbColtsOfOrder(currentOrder, mtbColts -> {
@@ -76,7 +82,7 @@ public class ProdRientroMerceOrderDetailViewModel {
             }
 
             this.mtbColtsOfOrder.postValue(mtbColts);
-            this.sendOnLoadingEnded();
+            //this.sendOnLoadingEnded();
         }, this::sendError);
     }
 
@@ -92,7 +98,7 @@ public class ProdRientroMerceOrderDetailViewModel {
                     "         WHERE cod_jfas IS NOT NULL " +
                     "           AND gestione = " + UtilityDB.valueToString(currentOrder.getGestione()) +
                     "           AND num_ord = " + UtilityDB.valueToString(currentOrder.getNumOrd()) +
-                    "           AND data_ord = " + UtilityDB.valueToString(currentOrder.getDataOrdD()) +
+                    "           AND data_ord = " + UtilityDB.valueToString(currentOrder.getDataOrd()) +
                     "     ) tmp " +
                     "WHERE (data_iniz IS NOT NULL" +
                     "  AND (data_fine IS NULL OR last_step = id_step))" +
@@ -122,7 +128,7 @@ public class ProdRientroMerceOrderDetailViewModel {
                         .setCodMart(currentOrder.getCodProd())
                         .setCodTcol(pickedQuantityDTO.getMtbTCol() != null ? pickedQuantityDTO.getMtbTCol().getCodTcol() : null)
                         .setDataCollo(LocalDate.now())
-                        .setDataOrd(currentOrder.getDataOrdD())
+                        .setDataOrd(currentOrder.getDataOrd())
                         .setNumOrd(currentOrder.getNumOrd())
                         .setGestione(currentOrder.getGestione())
                         .setPartitaMag(currentOrder.getPartitaMag())
@@ -133,13 +139,43 @@ public class ProdRientroMerceOrderDetailViewModel {
 
         this.prodRientroMerceOrderDetailRESTConsumer.importColliDaProduzione(importColliDaProduzioneRequestDTO, mtbColtSaved -> {
 
+            if(SettingsManager.iDB().isProduzioneGeneraDocCar() || SettingsManager.iDB().isProduzioneGeneraDocScar()) {
 
-            synchronized (this.mtbColtsOfOrder) {
-                this.mListener.onDataSaved(mtbColtSaved);
+                CaricoProdFinDTO caricoProdFinDTO = new CaricoProdFinDTO()
+                        .setEscludiArticoliGestitiDaWmsInScarico(true)
+                        .setGestione(currentOrder.getGestione())
+                        .setNumOrd(currentOrder.getNumOrd())
+                        .setDataOrd(currentOrder.getDataOrd())
+                        .setCodJfas(pickedQuantityDTO.getCodJfas())
+                        .setCodAnag(currentOrder.getCodAnag())
+                        .setCodMdep(currentOrder.getCodMdep())
+                        .setPreparatoDa(SettingsManager.i().getUser().getUsername())
+                        .setEffettuaCaricoProdotto(SettingsManager.iDB().isProduzioneGeneraDocCar())
+                        .setCreaCaricoDaCollo(true)
+                        .setCodDtipCar(SettingsManager.iDB().getProduzioneCodDtipCar())
+                        .setEffettuaScaricoMateriali(SettingsManager.iDB().isProduzioneGeneraDocScar())
+                        .setCodDtipScar(SettingsManager.iDB().getProduzioneCodDtipScar());
+
+                caricoProdFinDTO.getProdotti().getRow()
+                        .add(new CaricoProdFinProdottoDTO()
+                                .setQtaProdAna(pickedQuantityDTO.getQtaCol()));
+
+
+                produzioneRESTConsumer.caricoProdFin(caricoProdFinDTO, () -> {
+
+                    synchronized (this.mtbColtsOfOrder) {
+                        this.sendOnLoadingEnded();
+                        this.mListener.onDataSaved(mtbColtSaved);
+                    }
+
+                }, this::sendError);
+            } else {
+                synchronized (this.mtbColtsOfOrder) {
+                    this.sendOnLoadingEnded();
+                    this.mListener.onDataSaved(mtbColtSaved);
+                }
             }
         }, this::sendError);
-
-
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java
index 1b0ed8ae..a722b1bc 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java
@@ -49,7 +49,7 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
                 "                                   mtb_colr.ser_collo = mc.ser_collo AND mtb_colr.num_collo = mc.num_collo " +
                 " WHERE " +
                 " mtb_colr.num_ord = " + UtilityDB.valueToString(ordineLavorazioneDTO.getNumOrd()) + " AND" +
-                " mtb_colr.data_ord = " + UtilityDB.valueToString(ordineLavorazioneDTO.getDataOrdD()) + " AND" +
+                " mtb_colr.data_ord = " + UtilityDB.valueToString(ordineLavorazioneDTO.getDataOrd()) + " AND" +
                 " mtb_colr.gestione = 'L' AND" +
                 " mc.segno = 1";
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/dto/ImportColliDaProduzioneRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/dto/ImportColliDaProduzioneRequestDTO.java
index 3d3c321a..2ab215ca 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/dto/ImportColliDaProduzioneRequestDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/dto/ImportColliDaProduzioneRequestDTO.java
@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.dt
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.Date;
 
 public class ImportColliDaProduzioneRequestDTO {
 
@@ -18,7 +17,7 @@ public class ImportColliDaProduzioneRequestDTO {
     private BigDecimal qtaCnf;
     private LocalDate dataCollo;
 
-    private Date dataOrd;
+    private LocalDate dataOrd;
     private int numOrd;
     private String codJfas;
     private String gestione;
@@ -119,11 +118,11 @@ public class ImportColliDaProduzioneRequestDTO {
         return this;
     }
 
-    public Date getDataOrd() {
+    public LocalDate getDataOrd() {
         return dataOrd;
     }
 
-    public ImportColliDaProduzioneRequestDTO setDataOrd(Date dataOrd) {
+    public ImportColliDaProduzioneRequestDTO setDataOrd(LocalDate dataOrd) {
         this.dataOrd = dataOrd;
         return this;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java
index 61d4d4af..0fffb242 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java
@@ -16,6 +16,7 @@ import com.annimon.stream.ComparatorCompat;
 import com.annimon.stream.Stream;
 
 import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -120,7 +121,7 @@ public class ProdRientroMerceOrderListFragment extends Fragment {
                 .comparing(OrdineLavorazioneDTO::getCodAnag)
                 .thenComparing(ComparatorCompat.comparing(ordineLavorazioneDTO -> ordineLavorazioneDTO.getDescCommessa() != null ? ordineLavorazioneDTO.getDescCommessa() : "zzzzzzzz"))
                 .thenComparing(ComparatorCompat.comparing(ordineLavorazioneDTO -> ordineLavorazioneDTO.getDataConsCommessaD() != null ? String.valueOf(ordineLavorazioneDTO.getDataConsCommessaD().getTime()) : "999999999999")).reversed()
-                .thenComparing(ComparatorCompat.comparing(ordineLavorazioneDTO -> ordineLavorazioneDTO.getDataOrd() != null ? ordineLavorazioneDTO.getDataOrd() : "zzzzzzzz")).reversed()
+                .thenComparing(ComparatorCompat.comparing(ordineLavorazioneDTO -> ordineLavorazioneDTO.getDataOrd() != null ? ordineLavorazioneDTO.getDataOrd() : LocalDate.MAX)).reversed()
                 .thenComparing(ComparatorCompat.comparing(OrdineLavorazioneDTO::getNumOrd));
 
         if (dataList == null) return new ArrayList<>();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java
index b47e3539..56eaacb9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java
@@ -178,7 +178,7 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
                     listModel.setOriginalMtbAart(this.mViewModel.getMtbColrMutableLiveData().getValue().getMtbAart());
 
                     listModel.setPreDescriptionText(
-                            getString(R.string.ord_testata, String.valueOf(x.getNumOrd()), UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)));
+                            getString(R.string.ord_testata, String.valueOf(x.getNumOrd()), UtilityDate.formatDate(x.getDataOrd(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)));
 
                     listModel.setDescriptionText(x.getCodProd() + " " + x.getDescrizioneProd());
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
index e7f03c9d..d561e910 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
@@ -2,11 +2,11 @@ package it.integry.integrywmsnative.gest.prod_versamento_materiale.dto;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.di.BindableFloat;
-import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 public class OrdineLavorazioneDTO {
@@ -37,7 +37,7 @@ public class OrdineLavorazioneDTO {
 
     private BigDecimal numPedane;
 
-    private String dataOrd;
+    private LocalDate dataOrd;
 
     private String flagEvasoProd;
 
@@ -141,16 +141,13 @@ public class OrdineLavorazioneDTO {
         this.posRiga = posRiga;
     }
 
-    public String getDataOrd() {
+    public LocalDate getDataOrd() {
         return dataOrd;
     }
 
-    public Date getDataOrdD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(dataOrd);
-    }
-
-    public void setDataOrd(String dataOrd) {
+    public OrdineLavorazioneDTO setDataOrd(LocalDate dataOrd) {
         this.dataOrd = dataOrd;
+        return this;
     }
 
     public String getFlagEvasoProd() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index 34757538..833b7a5d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -17,12 +17,14 @@ import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.Stream;
+import com.google.android.material.snackbar.Snackbar;
 import com.tfb.fbtoast.FBToast;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import javax.inject.Inject;
 
@@ -860,13 +862,16 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     }
 
     @Override
-    public void onError(Exception ex) {
+    public void onError(Exception ex, boolean useSnackbar) {
         this.onLoadingEnded();
 
         if (ex instanceof InvalidPesoKGException) {
             UtilityToast.showToast(ex.getMessage());
         } else {
-            UtilityExceptions.defaultException(this, ex);
+            if(useSnackbar)
+                Snackbar.make(mBindings.getRoot(), Objects.requireNonNull(ex.getMessage()), Snackbar.LENGTH_LONG).show();
+            else
+                UtilityExceptions.defaultException(this, ex);
         }
 
         BarcodeManager.enable();
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 34bfd90b..ba0312be 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
@@ -365,7 +365,11 @@ public class SpedizioneViewModel {
     }
 
     private void sendError(Exception ex) {
-        if (this.mListener != null) mListener.onError(ex);
+        if (this.mListener != null) mListener.onError(ex, false);
+    }
+
+    private void sendError(Exception ex, boolean useSnackbar) {
+        if (this.mListener != null) mListener.onError(ex, useSnackbar);
     }
 
     private void sendLUOpened(MtbColt mtbColt) {
@@ -667,10 +671,16 @@ public class SpedizioneViewModel {
 
                 if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
                     this.executeEtichettaLU(ean128Model.Sscc, onComplete);
-                } else {
 
-                    PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
-                    this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
+                } else {
+                    if(SettingsManager.iDB().isFlagSpedizioneEnableManualPick()) {
+                        PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
+                        this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
+
+                    } else {
+                        this.sendError(new NoResultFromBarcodeException(), true);
+                        onComplete.run();
+                    }
                 }
             } else {
                 //EAN 128 non completo o comunque mancano i riferimenti al prodotto
@@ -693,7 +703,7 @@ public class SpedizioneViewModel {
     private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) {
         this.mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> {
 
-            if (mtbAartList != null && mtbAartList.size() > 0) {
+            if (mtbAartList != null && !mtbAartList.isEmpty()) {
                 if (mtbAartList.size() == 1) {
                     this.searchArtFromAnag(mtbAartList.get(0), pickData, onComplete);
                 } else {
@@ -855,7 +865,7 @@ public class SpedizioneViewModel {
 
 
     private void loadMatchedRows(List<PickingObjectDTO> matchedRows) {
-        if (matchedRows == null || matchedRows.size() == 0) {
+        if (matchedRows == null || matchedRows.isEmpty()) {
             this.sendError(new NoArtsFoundException());
         } else if (matchedRows.size() == 1) {
             PickingObjectDTO matchedItem = matchedRows.get(0);
@@ -2084,7 +2094,7 @@ public class SpedizioneViewModel {
 
         void onFilterRemoved();
 
-        void onError(Exception ex);
+        void onError(Exception ex, boolean useSnackbar);
 
         void onFullItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canOverflowOrderQuantity, boolean canBatchLotBeChanged, RunnableArgss<PickedQuantityDTO, Boolean> onComplete);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
index 0d33ce4c..37152686 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
@@ -64,7 +64,7 @@ public class DialogProgressView extends DialogFragment {
     }
 
     public void show(@NonNull FragmentManager manager) {
-        if (!progressOpened && !isAdded() && !isInLayout()) {
+        if (!isAdded() && !isInLayout()) {
             this.progressOpened = true;
             super.show(manager, "loading-dialog");
         }
@@ -72,7 +72,7 @@ public class DialogProgressView extends DialogFragment {
 
     @Override
     public void dismiss() {
-        if (progressOpened) {
+        if (isAdded() || isInLayout()) {
             this.progressOpened = false;
             super.dismissAllowingStateLoss();
         }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java
index 89698cca..eed2e817 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java
@@ -48,12 +48,14 @@ public class DialogChooseArtFromListaArtsView extends BaseDialogFragment {
 
         initRecyclerView(binding, mListaArts);
 
+        setCancelable(false);
+
         var alertDialog = new MaterialAlertDialogBuilder(requireContext())
                 .setView(binding.getRoot())
-                .setCancelable(false)
+                .setCancelable(isCancelable())
                 .create();
 
-        alertDialog.setCanceledOnTouchOutside(false);
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
         alertDialog.setOnShowListener(this);
         return alertDialog;
     }
diff --git a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
index a88e3914..5ec6ff88 100644
--- a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
@@ -129,7 +129,7 @@
                                     style="@style/AppTheme.NewMaterial.Text"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:text="@{UtilityDate.formatDate(view.currentOrder.dataOrdD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
+                                    android:text="@{UtilityDate.formatDate(view.currentOrder.dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
                                     android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
                                     tools:text="28 maggio 2021" />
 
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
index 1294caa5..294f002c 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
@@ -123,7 +123,7 @@
                                 style="@style/AppTheme.NewMaterial.Text"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:text="@{UtilityDate.formatDate(view.currentOrder.dataOrdD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
+                                android:text="@{UtilityDate.formatDate(view.currentOrder.dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
                                 android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
                                 tools:text="28 maggio 2021" />
 

From bdd6f2152205374794da7ecb5282c69d14a59824 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 14 Nov 2024 09:59:39 +0100
Subject: [PATCH 046/103] Fix su DialogProgressView

---
 .../integrywmsnative/view/dialogs/DialogProgressView.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
index 0d33ce4c..37152686 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
@@ -64,7 +64,7 @@ public class DialogProgressView extends DialogFragment {
     }
 
     public void show(@NonNull FragmentManager manager) {
-        if (!progressOpened && !isAdded() && !isInLayout()) {
+        if (!isAdded() && !isInLayout()) {
             this.progressOpened = true;
             super.show(manager, "loading-dialog");
         }
@@ -72,7 +72,7 @@ public class DialogProgressView extends DialogFragment {
 
     @Override
     public void dismiss() {
-        if (progressOpened) {
+        if (isAdded() || isInLayout()) {
             this.progressOpened = false;
             super.dismissAllowingStateLoss();
         }

From 665c261b9a0deccf24b7805b78649c7eb9ebf127 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 14 Nov 2024 10:01:56 +0100
Subject: [PATCH 047/103] -> v1.41.04 (452)

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

diff --git a/app/build.gradle b/app/build.gradle
index 4b483430..bdc44fe4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 451
-    def appVersionName = '1.41.03'
+    def appVersionCode = 452
+    def appVersionName = '1.41.04'
 
     signingConfigs {
         release {

From 4b0fbd0b6bc91d0f4e473f94ef92720711fc1764 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 15 Nov 2024 19:14:04 +0100
Subject: [PATCH 048/103] Rimossi destinatari che non sono attivi

---
 .../view/dialogs/ask_cliente/DialogAskClienteView.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java
index 42ceaa18..60ff5f75 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java
@@ -207,7 +207,7 @@ public class DialogAskClienteView extends BaseDialogFragment {
                 "       nazione\n" +
                 "FROM vtb_dest\n" +
                 "INNER JOIN vtb_clie ON vtb_clie.cod_anag = vtb_dest.cod_anag\n" +
-                "WHERE vtb_clie.flag_stato = 'A'";
+                "WHERE vtb_clie.flag_stato = 'A' AND vtb_dest.flag_attivo = 'S'";
 
         Type typeOfObjectsList = new TypeToken<ArrayList<DialogAskClienteDestinatarioDTO>>() {
         }.getType();

From 290d737ff70d2751325051e96feccc935d26339c Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 18 Nov 2024 11:38:59 +0100
Subject: [PATCH 049/103] -> v1.41.05 (453)

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

diff --git a/app/build.gradle b/app/build.gradle
index bdc44fe4..beed556b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 452
-    def appVersionName = '1.41.04'
+    def appVersionCode = 453
+    def appVersionName = '1.41.05'
 
     signingConfigs {
         release {

From 2adfda5f30b4ac45cdb5935f358b880b81a22496 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 18 Nov 2024 16:34:02 +0100
Subject: [PATCH 050/103] Ulteriori fix su DialogProgressView

---
 .../core/expansion/BaseActivity.java          |  2 +-
 .../core/expansion/BaseDialogFragment.java    |  2 +-
 .../core/expansion/BaseFragment.java          |  2 +-
 .../gest/settings/MainSettingsFragment.java   |  2 +-
 .../gest/spedizione/SpedizioneViewModel.java  | 29 ++++++++-----------
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
index 7fbc2ab9..d96a6950 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
@@ -61,7 +61,7 @@ public class BaseActivity extends AppCompatActivity {
     private void closeProgress() {
         BarcodeManager.enable();
         executorService.execute(() -> {
-            mCurrentProgress.dismissAllowingStateLoss();
+            mCurrentProgress.dismiss();
         });
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
index 8a426227..5f607310 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
@@ -85,7 +85,7 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
     private void closeProgress() {
         BarcodeManager.enable();
         executorService.execute(() -> {
-            mCurrentProgress.dismissAllowingStateLoss();
+            mCurrentProgress.dismiss();
         });
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
index 78c75012..3df725b5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
@@ -74,7 +74,7 @@ public abstract class BaseFragment extends Fragment {
     private void closeProgress() {
         BarcodeManager.enable();
         executorService.execute(() -> {
-            mCurrentProgress.dismissAllowingStateLoss();
+            mCurrentProgress.dismiss();
         });
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
index 71d6f300..ac529751 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
@@ -316,7 +316,7 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
     private void closeProgress() {
         executorService.execute(() -> {
-            mCurrentProgress.dismissAllowingStateLoss();
+            mCurrentProgress.dismiss();
         });
     }
 
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 52d48cfb..ce43239c 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
@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.gest.spedizione;
 
-import androidx.annotation.IntegerRes;
 import androidx.databinding.ObservableArrayList;
 import androidx.lifecycle.MutableLiveData;
 
@@ -11,18 +10,15 @@ import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
-import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
 import it.integry.integrywmsnative.core.exception.EmptyLUException;
@@ -89,7 +85,6 @@ import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityPosizione;
-import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.CurrentMonoLUPositionIsNotCorrectException;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidMagazzinoAutomaticoMovementException;
@@ -99,7 +94,6 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.OrdersLoadExceptio
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowQtaTotOrderedQuantityException;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.TracciamentoImballoDTO;
 
 public class SpedizioneViewModel {
@@ -193,19 +187,20 @@ public class SpedizioneViewModel {
         this.mUseQtaOrd = useQtaOrd;
         this.mUseColliPedana = useColliPedana;
 
-        if (enableGiacenza) {
-            mOrdiniRestConsumerService.getSuggestedPickingList(this.mDefaultCodMdep, pickingList, pickingObjectList -> {
-                this.mPickingList.postValue(pickingObjectList);
-            }, ex -> this.sendError(new OrdersLoadException(ex)));
-        } else {
-            getEmptyPickingList(pickingList, pickingObjectList -> {
-                this.mPickingList.postValue(pickingObjectList);
-            });
-        }
-
         getPartitaMagList(pickingList, mtbPartitaMagList -> {
             this.mPartitaMagList = mtbPartitaMagList;
-            this.sendOnLoadingEnded();
+
+            if (enableGiacenza) {
+                mOrdiniRestConsumerService.getSuggestedPickingList(this.mDefaultCodMdep, pickingList, pickingObjectList -> {
+                    this.mPickingList.postValue(pickingObjectList);
+                    this.sendOnLoadingEnded();
+                }, ex -> this.sendError(new OrdersLoadException(ex)));
+            } else {
+                getEmptyPickingList(pickingList, pickingObjectList -> {
+                    this.mPickingList.postValue(pickingObjectList);
+                    this.sendOnLoadingEnded();
+                });
+            }
         });
 
         this.mDefaultGestioneOfUL = gestioneCol;

From 929c52b94ceb6f6db0225b309ccbbbf7f5e492e2 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 18 Nov 2024 16:36:45 +0100
Subject: [PATCH 051/103] -> v1.41.06 (454)

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

diff --git a/app/build.gradle b/app/build.gradle
index beed556b..ff2d655c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 453
-    def appVersionName = '1.41.05'
+    def appVersionCode = 454
+    def appVersionName = '1.41.06'
 
     signingConfigs {
         release {

From 8b3d1f2a2ed88051686adf9e6b6f06063751726b Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 18 Nov 2024 18:31:01 +0100
Subject: [PATCH 052/103] Ulteriori fix su DialogProgressView

---
 .../integrywmsnative/core/expansion/BaseActivity.java     | 8 ++++----
 .../core/expansion/BaseDialogFragment.java                | 8 ++++----
 .../integrywmsnative/core/expansion/BaseFragment.java     | 8 ++++----
 .../gest/settings/MainSettingsFragment.java               | 8 ++++----
 .../integrywmsnative/view/dialogs/DialogProgressView.java | 4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
index d96a6950..5cf92c86 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
@@ -53,16 +53,16 @@ public class BaseActivity extends AppCompatActivity {
 
     private void openProgress() {
         BarcodeManager.disable();
-        executorService.execute(() -> {
+        //executorService.execute(() -> {
             this.mCurrentProgress.show(getSupportFragmentManager());
-        });
+        //});
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        executorService.execute(() -> {
+        //executorService.execute(() -> {
             mCurrentProgress.dismiss();
-        });
+        //});
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
index 5f607310..4cb8d6d9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
@@ -77,16 +77,16 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
 
     private void openProgress() {
         BarcodeManager.disable();
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
-        });
+//        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             mCurrentProgress.dismiss();
-        });
+//        });
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
index 3df725b5..b3b79372 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
@@ -66,16 +66,16 @@ public abstract class BaseFragment extends Fragment {
 
     private void openProgress() {
         BarcodeManager.disable();
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
-        });
+//        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             mCurrentProgress.dismiss();
-        });
+//        });
     }
 
     public void onError(Exception ex) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
index ac529751..fbe5a87c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
@@ -309,15 +309,15 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
 
     private void openProgress() {
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
-        });
+//        });
     }
 
     private void closeProgress() {
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             mCurrentProgress.dismiss();
-        });
+//        });
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
index 37152686..2b4d0120 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
@@ -64,7 +64,7 @@ public class DialogProgressView extends DialogFragment {
     }
 
     public void show(@NonNull FragmentManager manager) {
-        if (!isAdded() && !isInLayout()) {
+        if (!isAdded() && !isInLayout() && !progressOpened) {
             this.progressOpened = true;
             super.show(manager, "loading-dialog");
         }
@@ -72,7 +72,7 @@ public class DialogProgressView extends DialogFragment {
 
     @Override
     public void dismiss() {
-        if (isAdded() || isInLayout()) {
+        if (isAdded() || isInLayout() || progressOpened) {
             this.progressOpened = false;
             super.dismissAllowingStateLoss();
         }

From 0e24f7188cebc04c1550472de4e477d942fe2cfd Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 18 Nov 2024 18:31:43 +0100
Subject: [PATCH 053/103] -> v1.41.07 (455)

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

diff --git a/app/build.gradle b/app/build.gradle
index ff2d655c..d8479f19 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 454
-    def appVersionName = '1.41.06'
+    def appVersionCode = 455
+    def appVersionName = '1.41.07'
 
     signingConfigs {
         release {

From 47143fe97d8962fd0f177fab3eb1a3b3c263cf47 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 21 Nov 2024 18:33:20 +0100
Subject: [PATCH 054/103] Fix sul caricamento degli ordini di acquisto

---
 .../core/expansion/BaseDialogFragment.java    |  3 ++-
 .../PVOrdiniAcquistoRESTConsumer.java         | 21 ++++++-------------
 .../DialogScanGrigliaAcquistoView.java        |  5 ++++-
 build.gradle                                  |  2 +-
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
index 4cb8d6d9..42b9c1c0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
@@ -91,8 +91,9 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
 
 
     public void onError(Exception ex) {
+        this.onLoadingEnded();
+
         requireActivity().runOnUiThread(() -> {
-            this.onLoadingEnded();
             UtilityExceptions.defaultException(requireActivity(), ex);
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java
index 16459e4d..930353f6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java
@@ -17,7 +17,6 @@ import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
-import it.integry.integrywmsnative.core.utility.UtilityThread;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ArtDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.OrdineDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
@@ -42,17 +41,13 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     public void onResponse(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Response<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> response) {
                         var startTime = new Date().getTime();
                         analyzeAnswer(response, "retrieveArticoliOrdine", articoliOrdineWrapper -> {
-                            UtilityThread.executeParallel(() -> {
-                                Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
-                                onSuccess.run(articoliOrdineWrapper);
-                            }, false);
+                            Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
+                            onSuccess.run(articoliOrdineWrapper);
                         }, onFailed);
                     }
 
                     @Override
                     public void onFailure(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Throwable t) {
-                        Log.e("getArticoliListino_pv", t.toString());
-                        UtilityLogger.error(new Exception(t));
                         onFailed.run(new Exception(t));
                     }
                 });
@@ -66,17 +61,13 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     public void onResponse(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Response<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> response) {
                         var startTime = new Date().getTime();
                         analyzeAnswer(response, "retrieveArticoliOrdine", articoliOrdineWrapper -> {
-                            UtilityThread.executeParallel(() -> {
-                                Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
-                                onSuccess.run(articoliOrdineWrapper);
-                            }, false);
+                            Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
+                            onSuccess.run(articoliOrdineWrapper);
                         }, onFailed);
                     }
 
                     @Override
                     public void onFailure(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Throwable t) {
-                        Log.e("getArticoliListino_pv", t.toString());
-                        UtilityLogger.error(new Exception(t));
                         onFailed.run(new Exception(t));
                     }
                 });
@@ -105,7 +96,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                         var startTime = new Date().getTime();
                         analyzeAnswer(response, "retrieveArticoliOrdine", articoliOrdineWrapper -> {
-                            UtilityThread.executeParallel(() -> {
+//                            UtilityThread.executeParallel(() -> {
 //                                if (data == null) {
 //                                    onFailed.run(new Exception("Nessun ordine generato"));
 //                                    return;
@@ -117,7 +108,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
 //                                ordine.setCodMdep(data.getCodMdep());
 //                                ordine.setNumOrd(data.getNumOrd());
                                 onSuccess.run(ordine);
-                            }, false);
+//                            }, false);
                         }, onFailed);
                     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java
index 05cf08fe..048baa31 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java
@@ -130,8 +130,10 @@ public class DialogScanGrigliaAcquistoView extends BaseDialogFragment {
         this.onLoadingStarted();
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
         pvOrdiniAcquistoRESTConsumer.retrieveArticoli(codAlis, codMdep, dto -> {
+
             this.onLoadingEnded();
-            if (dto.getArticoli().size() == 0) {
+
+            if (dto.getArticoli().isEmpty()) {
                 if (UtilityString.isNullOrEmpty(codAlis)) {
                     onFailed.run(new NoArtsFoundException());
                 } else {
@@ -146,6 +148,7 @@ public class DialogScanGrigliaAcquistoView extends BaseDialogFragment {
             mGriglia.setDescrDepo(dto.getDescrDepo());
             mListArticoli = dto.getArticoli();
             this.dismiss();
+
         }, onFailed);
     }
 
diff --git a/build.gradle b/build.gradle
index aeeee85b..b8a52f85 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.20'
-        agp_version = '8.7.1'
+        agp_version = '8.7.2'
     }
 
     repositories {

From 191953a0036c98a1bb85d19529b0856a31f48aaf Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 21 Nov 2024 18:34:04 +0100
Subject: [PATCH 055/103] -> v1.41.08 (456)

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

diff --git a/app/build.gradle b/app/build.gradle
index d8479f19..b2b722c9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 455
-    def appVersionName = '1.41.07'
+    def appVersionCode = 456
+    def appVersionName = '1.41.08'
 
     signingConfigs {
         release {

From 9df1c37ee9e80fbfbe9b553092e1c49e30cb9d80 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 25 Nov 2024 11:40:13 +0100
Subject: [PATCH 056/103] Fix su esportazione log

---
 .../core/utility/UtilityExceptions.java       |  2 ++
 .../gest/settings/MainSettingsFragment.java   | 23 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
index 6843d1b8..cfe305fa 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
@@ -63,6 +63,8 @@ public class UtilityExceptions {
         if (!BuildConfig.DEBUG && !toIgnore) {
             if (sendEmail) UtilityLogger.error(ex);
             FirebaseCrashlytics.getInstance().recordException(ex);
+        } else {
+            ex.printStackTrace();
         }
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
index fbe5a87c..e10e28c8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
@@ -18,7 +18,6 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.sqlite.db.SimpleSQLiteQuery;
 
 import com.annimon.stream.Stream;
-import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.harrysoft.androidbluetoothserial.BluetoothManager;
 
 import java.io.BufferedReader;
@@ -45,6 +44,7 @@ import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.MailAttachmentDTO;
 import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
@@ -293,13 +293,16 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
                                 });
                             });
                         } catch (Exception ex) {
-                            requireActivity().runOnUiThread(() -> {
-                                DialogSimpleMessageView
-                                        .makeErrorDialog(new SpannableString(Html.fromHtml(ex.getMessage())), null, null)
-                                        .show(requireActivity().getSupportFragmentManager(), "tag");
-                            });
+                            UtilityExceptions.defaultException(requireContext(), ex);
+                            this.closeProgress();
 
-                            FirebaseCrashlytics.getInstance().recordException(ex);
+//                            requireActivity().runOnUiThread(() -> {
+//                                DialogSimpleMessageView
+//                                        .makeErrorDialog(new SpannableString(Html.fromHtml(ex.getMessage())), null, null)
+//                                        .show(requireActivity().getSupportFragmentManager(), "tag");
+//                            });
+//
+//                            FirebaseCrashlytics.getInstance().recordException(ex);
                         }
                     });
                 })
@@ -330,6 +333,12 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
             String line;
 
             while ((line = br.readLine()) != null) {
+
+                if(!line.matches("\\d{13}.*")) {
+                    int lastNewLineChar = text.lastIndexOf("\n");
+                    text.deleteCharAt(text.length() - 1);
+                }
+
                 text.append(line);
                 text.append('\n');
             }

From 3d341ac99d172ce4be8e75506c268cd1c0a8014a Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 25 Nov 2024 11:48:13 +0100
Subject: [PATCH 057/103] -> v1.41.09 (457)

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

diff --git a/app/build.gradle b/app/build.gradle
index b2b722c9..6f112f2d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 456
-    def appVersionName = '1.41.08'
+    def appVersionCode = 457
+    def appVersionName = '1.41.09'
 
     signingConfigs {
         release {

From 7ed3b421a10d868125e17ee2f140b74a1c3180ff Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 4 Dec 2024 10:25:10 +0100
Subject: [PATCH 058/103] Fix su setup nulla in DialogSelectDocInfoViewModel

---
 .../dialog/DialogSelectDocInfoViewModel.java                  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java
index ec74bfa4..39f6af4c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java
@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dialog;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -36,7 +37,8 @@ public class DialogSelectDocInfoViewModel extends ViewModel {
     private final MutableLiveData<Boolean> noteRequired = new MutableLiveData<>(false);
 
     public DialogSelectDocInfoViewModel() {
-        List<String> requestNumDocList = Arrays.asList(SettingsManager.iDB().getDocInterniRequestNumDoc().split("\\|"));
+        String docInterniRequestNumDoc = SettingsManager.iDB().getDocInterniRequestNumDoc();
+        List<String> requestNumDocList = docInterniRequestNumDoc != null ? Arrays.asList(docInterniRequestNumDoc.split("\\|")) : new ArrayList<>();
 
         tipoDoc.observeForever(val -> fornitoreRequired.postValue(val != null && (val.getGestioneDoc().equals("T") || val.getGestioneDoc().equals("A") || (val.getGestioneDoc().equals("P") && !val.getGestione().equals("L")))));
 

From 39841f6b0d548479f0427731c107b8214178e450 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 4 Dec 2024 10:26:38 +0100
Subject: [PATCH 059/103] -> v1.41.10 (458)

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

diff --git a/app/build.gradle b/app/build.gradle
index 6f112f2d..d95ad6cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 457
-    def appVersionName = '1.41.09'
+    def appVersionCode = 458
+    def appVersionName = '1.41.10'
 
     signingConfigs {
         release {

From e70d5697c30439e9f4cef7c76bd184132849dc44 Mon Sep 17 00:00:00 2001
From: ValerioC <v.castellana@integry.it>
Date: Thu, 5 Dec 2024 16:08:48 +0100
Subject: [PATCH 060/103] aggiunto isnull su numero risorse in query recuper
 materiale versato

---
 .../rest/ProdRecuperMaterialeRESTConsumer.java                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
index bfa6841a..c29fc86a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
@@ -68,7 +68,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "           dtb_ord_steps.hr_num                                      as hr, " +
                 "           mtb_colr.riga_ord, " +
                 "           CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / " +
-                "                                   SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
+                "                                   SUM(CASE WHEN dtb_ord_steps.hr_num > 0 then dtb_ord_steps.hr_num else 1 end) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
                 "                                  0))                                as percentage_hr " +
                 "    FROM mtb_colr " +
                 "             INNER JOIN mtb_colt ON mtb_colr.num_collo = mtb_colt.num_collo " +

From b48b2fbac95513e37fb106ab102b8840d5893bd4 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 5 Dec 2024 17:24:48 +0100
Subject: [PATCH 061/103] Fix su sorting partita mag nulla in Spedizione

---
 .../integrywmsnative/gest/spedizione/SpedizioneViewModel.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ce43239c..8a4b558b 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
@@ -942,7 +942,7 @@ public class SpedizioneViewModel {
                 if (availableBatchLots.stream().anyMatch(x -> x.getDataScad() == null)) {
                     tmp.addAll(availableBatchLots.stream()
                             .filter(x -> x.getDataScad() == null)
-                            .sorted(Comparator.comparing(MtbPartitaMag::getPartitaMag))
+                            .sorted(Comparator.comparing(x -> UtilityString.isNull(x.getPartitaMag(), "")))
                             .collect(Collectors.toList()));
                 }
 

From 403f2ec57c59bff70e2256d9105617d00c38fa4d Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 5 Dec 2024 17:25:42 +0100
Subject: [PATCH 062/103] -> v1.41.11 (459)

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

diff --git a/app/build.gradle b/app/build.gradle
index d95ad6cb..fd88aa00 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 458
-    def appVersionName = '1.41.10'
+    def appVersionCode = 459
+    def appVersionName = '1.41.11'
 
     signingConfigs {
         release {

From 73b1a77a12ac01ba6e4adec96d006778b2416d3a Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 6 Dec 2024 11:37:09 +0100
Subject: [PATCH 063/103] Migliorata gestione degli Updates in modo da forzare
 gli aggiornamenti di default a meno che non venga specificato forced=false
 nel file version.txt

---
 app/build.gradle                              |  2 +-
 .../rest/consumers/SystemRESTConsumer.java    | 23 +++++++---
 .../consumers/SystemRESTConsumerService.java  |  4 ++
 .../rest/consumers/_BaseRESTConsumer.java     | 26 +++++++++++
 .../model/system/LatestAppVersionInfoDTO.java | 44 +++++++++++++++++++
 .../core/update/UpdatesManager.java           | 38 +++++++++++-----
 .../core/utility/FileDownloader.java          |  2 +
 .../gest/main/MainActivity.java               |  6 ++-
 8 files changed, 127 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/system/LatestAppVersionInfoDTO.java

diff --git a/app/build.gradle b/app/build.gradle
index fd88aa00..fcb68f41 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -75,7 +75,7 @@ android {
     build {
         doLast {
             delete "$projectDir/build/outputs/apk/release/version.txt"
-            file("$projectDir/build/outputs/apk/release/version.txt").text = appVersionCode + '\n' + appVersionName
+            file("$projectDir/build/outputs/apk/release/version.txt").text = appVersionCode + '\n' + appVersionName + '\n' + 'forced=true'
         }
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
index fd8bbbda..da5fd31c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
@@ -4,9 +4,6 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonParseException;
 import com.orhanobut.logger.Logger;
 
 import java.io.ByteArrayInputStream;
@@ -15,7 +12,6 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.Type;
 import java.net.ConnectException;
-import java.util.Date;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -29,9 +25,9 @@ import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
 import it.integry.integrywmsnative.core.rest.model.system.RegisterDeviceRequestDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityGson;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import retrofit2.Call;
@@ -42,6 +38,23 @@ import retrofit2.Response;
 public class SystemRESTConsumer extends _BaseRESTConsumer {
 
 
+    public void retrieveUpdatesInfo(final RunnableArgs<LatestAppVersionInfoDTO> onSuccess, final RunnableArgs<Exception> onFailed) {
+        SystemRESTConsumerService systemRESTConsumerService = RESTBuilder.getService(SystemRESTConsumerService.class);
+        systemRESTConsumerService.retrieveUpdatesInfo()
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<LatestAppVersionInfoDTO> call, Response<LatestAppVersionInfoDTO> response) {
+                        analyzeAnswerGeneric(response, "updates", onSuccess, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<LatestAppVersionInfoDTO> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+
     public void registerDevice(final Runnable onSuccess, final RunnableArgs<Exception> onFailed) {
         RegisterDeviceRequestDTO registerDeviceRequestDTO = new RegisterDeviceRequestDTO()
                 .setApp("WMS");
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java
index 2ed64fbe..7c6f0662 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java
@@ -6,6 +6,7 @@ import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
 import it.integry.integrywmsnative.core.rest.model.system.RegisterDeviceRequestDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
@@ -15,6 +16,9 @@ import retrofit2.http.Query;
 
 public interface SystemRESTConsumerService {
 
+    @GET("wms/currentVersion")
+    Call<LatestAppVersionInfoDTO> retrieveUpdatesInfo();
+
     @POST("device/register")
     Call<ServiceRESTResponse<Void>> registerDevice(@Body RegisterDeviceRequestDTO registerDeviceRequestDTO);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java
index e513aeca..01cc92cc 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java
@@ -15,6 +15,32 @@ import retrofit2.Response;
 
 public abstract class _BaseRESTConsumer {
 
+
+    public static <T> void analyzeAnswerGeneric(Response<T> response, String logTitle, RunnableArgs<T> onComplete, RunnableArgs<Exception> onFailed) {
+        try {
+            var data = analyzeAnswerGeneric(response, logTitle);
+            onComplete.run(data);
+        } catch (Exception e) {
+            onFailed.run(e);
+        }
+    }
+
+    public static <T> T analyzeAnswerGeneric(Response<T> response, String logTitle) throws Exception {
+        if (response.isSuccessful()) {
+            return response.body();
+        } else {
+            if (response.code() == 404) {
+                Log.e(logTitle, "Errore " + response.code() + ": risorsa non trovata (" + response.raw().request().url() + ")");
+                throw new Exception("Errore " + response.code() + ": risorsa non trovata (" + logTitle + ")");
+            } else if (response.code() == 550)
+                throw new InvalidLicenseException();
+            else {
+                Log.e(logTitle, "Status " + response.code() + ": " + response.message());
+                throw new Exception("Status " + response.code() + ": " + response.message());
+            }
+        }
+    }
+
     public static <T> T analyzeAnswer(Response<ServiceRESTResponse<T>> response, String logTitle) throws Exception {
         if (response.isSuccessful()) {
             if (response.body() != null) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/system/LatestAppVersionInfoDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/system/LatestAppVersionInfoDTO.java
new file mode 100644
index 00000000..ccc61710
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/system/LatestAppVersionInfoDTO.java
@@ -0,0 +1,44 @@
+package it.integry.integrywmsnative.core.rest.model.system;
+
+public class LatestAppVersionInfoDTO {
+    private String latestVersion;
+    private int latestVersionCode;
+    private String url;
+    private boolean forced;
+
+    public String getLatestVersion() {
+        return latestVersion;
+    }
+
+    public LatestAppVersionInfoDTO setLatestVersion(String latestVersion) {
+        this.latestVersion = latestVersion;
+        return this;
+    }
+
+    public int getLatestVersionCode() {
+        return latestVersionCode;
+    }
+
+    public LatestAppVersionInfoDTO setLatestVersionCode(int latestVersionCode) {
+        this.latestVersionCode = latestVersionCode;
+        return this;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public LatestAppVersionInfoDTO setUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+    public boolean isForced() {
+        return forced;
+    }
+
+    public LatestAppVersionInfoDTO setForced(boolean forced) {
+        this.forced = forced;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java
index e776427a..3aaee7d8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java
@@ -15,16 +15,19 @@ import java.io.File;
 
 import javax.inject.Singleton;
 
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.FileDownloader;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
 @Singleton
 public class UpdatesManager {
 
+
     private AppCompatActivity mContext;
 
-    public void init(AppCompatActivity activityContext) {
+    public void init(AppCompatActivity activityContext, SystemRESTConsumer systemRESTConsumer) {
         this.mContext = activityContext;
 
         final String baseEndpoint = SettingsManager.i().getServer().getProtocol() + "://" + SettingsManager.i().getServer().getHost() +
@@ -34,15 +37,22 @@ public class UpdatesManager {
         final String currentDownloadUrl = baseEndpoint + "/ems-api/wms/android-release.apk";
 
 
-        AppUpdater appUpdater = new AppUpdater(mContext)
-                .setDisplay(Display.DIALOG)
-                .setUpdateFrom(UpdateFrom.JSON)
-                .setUpdateJSON(currentVersionUrl)
-                .setButtonDoNotShowAgain(null)
-                .setButtonUpdateClickListener((dialog, which) -> {
-                    installAPK(currentDownloadUrl);
-                });
-        appUpdater.start();
+        systemRESTConsumer.retrieveUpdatesInfo(latestData -> {
+
+            AppUpdater appUpdater = new AppUpdater(mContext)
+                    .setDisplay(Display.DIALOG)
+                    .setUpdateFrom(UpdateFrom.JSON)
+                    .setUpdateJSON(currentVersionUrl)
+                    .setButtonDoNotShowAgain(null)
+                    .setButtonUpdateClickListener((dialog, which) -> {
+                        installAPK(currentDownloadUrl);
+                    });
+
+            if(latestData.isForced())
+                appUpdater.setButtonDismiss(null);
+
+            appUpdater.start();
+        }, ex -> UtilityExceptions.defaultException(mContext, ex));
     }
 
 
@@ -67,6 +77,11 @@ public class UpdatesManager {
                     mContext.runOnUiThread(() -> {
                         progressDialogBuilder.dismiss();
 
+                        if (!destination.exists()) {
+                            UtilityExceptions.defaultException(mContext, new Exception("Errore durante il download dell'aggiornamento"));
+                            return;
+                        }
+
                         Uri fileLoc;
                         Intent intent;
 
@@ -93,7 +108,8 @@ public class UpdatesManager {
             try {
                 fileDownloader.download();
             } catch (Exception e) {
-                e.printStackTrace();
+                progressDialogBuilder.dismissAllowingStateLoss();
+                UtilityExceptions.defaultException(mContext, e);
             }
         }).start();
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/FileDownloader.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/FileDownloader.java
index 4e51b26d..fd9fc64e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/FileDownloader.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/FileDownloader.java
@@ -61,6 +61,8 @@ public class FileDownloader {
             }
 
         } catch (Exception e) {
+            if(downloadFile != null && downloadFile.exists())
+                downloadFile.delete();
             throw e;
 
         } finally {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
index 64941217..58603a94 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
@@ -41,6 +41,7 @@ import it.integry.integrywmsnative.core.interfaces.ISearchableFragment;
 import it.integry.integrywmsnative.core.interfaces.ISelectAllFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.menu.MenuService;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.update.UpdatesManager;
 import it.integry.integrywmsnative.core.utility.UtilityContext;
@@ -69,6 +70,9 @@ public class MainActivity extends BaseActivity
     @Inject
     UpdatesManager updatesManager;
 
+    @Inject
+    SystemRESTConsumer systemRESTConsumer;
+
     @Inject
     DialogProgressView mDialogProgressView;
 
@@ -85,7 +89,7 @@ public class MainActivity extends BaseActivity
         mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_main, null, false);
         setContentView(mBinding.getRoot());
 
-        updatesManager.init(this);
+        updatesManager.init(this, systemRESTConsumer);
         UtilityContext.initMainActivity(this);
 
         setSupportActionBar(mBinding.appBarMain.toolbar);

From 653cd3fd75af39b9f838f4bcb1d137eb00843256 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 9 Dec 2024 19:18:03 +0100
Subject: [PATCH 064/103] Implementata creazione di un nuovo articolo da
 Rettifica Giacenze

---
 app/build.gradle                              |  19 +-
 .../MainApplicationComponent.java             |   7 +-
 .../integrywmsnative/core/di/Converters.java  | 102 ++++-
 .../core/di/ValidatableObservableField.java   |  65 +++
 .../binders/AutoCompleteTextViewBinders.java  |  22 +-
 .../di/binders/TextInputLayoutBinders.java    |   1 +
 .../di/validators/GreaterThenValidator.java   |  23 +
 .../di/validators/MinLengthValidator.java     |  21 +
 .../core/di/validators/NotEmptyValidator.java |  19 +
 .../core/di/validators/NotNullValidator.java  |  19 +
 .../core/di/validators/Validator.java         |   7 +
 .../integrywmsnative/core/model/MtbGrup.java  |  13 +
 .../integrywmsnative/core/model/MtbSfam.java  |  49 ++
 .../integrywmsnative/core/model/MtbSgrp.java  | 112 +++++
 .../rest/consumers/ArticoloRESTConsumer.java  |  62 +++
 .../ArticoloRESTConsumerService.java          |  14 +
 .../consumers/ColliMagazzinoRESTConsumer.java |   2 +-
 .../core/rest/model/articolo/ArticoloDTO.java | 257 +++++++++++
 .../articolo/SaveArticoloRequestDTO.java      |  14 +
 .../articolo/SaveArticoloResponseDTO.java     |   9 +
 .../core/settings/DBSettingsModel.java        |  20 +
 .../core/settings/SettingsManager.java        |  15 +
 .../core/utility/UtilityBarcode.java          |  81 +++-
 .../core/utility/UtilityObservable.java       |  39 ++
 .../ProdRecuperoMaterialeViewModel.java       |   3 +
 .../PVOrdineAcquistoEditActivity.java         |   2 +-
 .../RettificaGiacenzeFragment.java            |  45 +-
 .../RettificaGiacenzeViewModel.java           | 115 ++---
 .../DialogUltimeConsegneFiltroAvanzato.java   |   3 +-
 .../SimpleAutoCompleteDropdownAdapter.java    | 133 +++---
 .../DialogCreateNewArtComponent.java          |  14 +
 .../DialogCreateNewArtModule.java             |  15 +
 .../DialogCreateNewArtView.java               | 302 +++++++++++++
 .../DialogCreateNewArtViewModel.java          | 209 +++++++++
 .../DialogInputQuantityV2View.java            |   6 +-
 .../main/res/drawable/ic_check_black_24dp.xml |   9 -
 .../main/res/drawable/ic_check_white_24dp.xml |   9 -
 .../main/res/drawable/ic_round_check_24.xml   |   5 +
 .../layout-land-hdpi/dialog_input_lu_prod.xml |  12 +-
 .../dialog_input_quantity_v2.xml              |  46 +-
 .../main/res/layout-large/activity_login.xml  |  17 +-
 app/src/main/res/layout/activity_login.xml    | 201 ++++-----
 .../activity_pv_ordine_acquisto_edit.xml      |   4 +-
 app/src/main/res/layout/app_bar_main.xml      |   2 +-
 .../res/layout/dialog_ask_info_inventario.xml |   4 +-
 .../dialog_ask_position_of_lu__page2.xml      |   2 +-
 .../res/layout/dialog_ask_should_print.xml    |   2 +-
 .../main/res/layout/dialog_create_new_art.xml | 424 ++++++++++++++++++
 .../res/layout/dialog_info_aggiuntive_lu.xml  |   2 +-
 .../main/res/layout/dialog_input_general.xml  |   2 +-
 .../main/res/layout/dialog_input_lu_prod.xml  |  12 +-
 .../main/res/layout/dialog_input_peso_lu.xml  |   4 +-
 .../dialog_input_quantity_to_return.xml       |   2 +-
 .../res/layout/dialog_input_quantity_v2.xml   |  60 ++-
 .../res/layout/dialog_pv_edit_articolo.xml    |   6 +-
 .../fragment_main_accettazione_bolla.xml      |   2 +-
 .../fragment_main_accettazione_ordini.xml     |   2 +-
 .../layout/fragment_main_ordini_uscita.xml    |   2 +-
 .../fragment_main_rettifica_giacenze.xml      | 148 +++---
 .../fragment_main_ultime_consegne_cliente.xml |   2 +-
 .../res/layout/fragment_picking_libero.xml    |   2 +-
 .../fragment_prod_fabbisogno_linee_prod.xml   |   2 +-
 ...fragment_prod_ordine_produzione_elenco.xml |   2 +-
 .../fragment_prod_versamento_materiale.xml    |   2 +-
 .../fragment_ultimi_arrivi_fornitore.xml      |   2 +-
 .../res/menu/doc_interni_edit_fab_menu.xml    |   2 +-
 app/src/main/res/values-it/strings.xml        |   4 +-
 app/src/main/res/values/colors.xml            |   2 +-
 app/src/main/res/values/config.xml            |   2 +
 app/src/main/res/values/strings.xml           |   6 +-
 app/src/main/res/values/styles.xml            |  52 +--
 app/src/main/res/values/themes.xml            |  10 +-
 72 files changed, 2366 insertions(+), 542 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/di/ValidatableObservableField.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/di/validators/GreaterThenValidator.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/di/validators/MinLengthValidator.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/di/validators/NotEmptyValidator.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/di/validators/NotNullValidator.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/di/validators/Validator.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/model/MtbSfam.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/model/MtbSgrp.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/ArticoloDTO.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/SaveArticoloRequestDTO.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/SaveArticoloResponseDTO.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtComponent.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtModule.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtView.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtViewModel.java
 delete mode 100644 app/src/main/res/drawable/ic_check_black_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_check_white_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_round_check_24.xml
 create mode 100644 app/src/main/res/layout/dialog_create_new_art.xml

diff --git a/app/build.gradle b/app/build.gradle
index fcb68f41..749e9ba6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -92,7 +92,7 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.3'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
@@ -103,17 +103,17 @@ dependencies {
     //Firebase
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:32.8.1')
+    implementation platform('com.google.firebase:firebase-bom:33.7.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:18.3.0'
+    implementation 'com.google.android.gms:play-services-basement:18.5.0'
 
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.11.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
 
@@ -127,12 +127,12 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.annimon:stream:1.2.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
 //    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
-    def dagger2_version = '2.46.1'
+    def dagger2_version = '2.49'
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
@@ -182,6 +182,9 @@ dependencies {
     // RxJava is also required.
     implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+
+    //Barcode generator
+    implementation group: 'com.google.zxing', name: 'core', version: '3.5.3'
 }
 
 repositories {
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
index 13acc45b..214f6815 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
@@ -126,6 +126,8 @@ import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.Di
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrListModule;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotComponent;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
+import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtComponent;
+import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtModule;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUComponent;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUModule;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdComponent;
@@ -218,7 +220,8 @@ import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracc
         DialogInfoGiacenzaModule.class,
         ArticoliInGiacenzaModule.class,
         DialogTracciamentoImballiModule.class,
-        DialogAskVettoreModule.class
+        DialogAskVettoreModule.class,
+        DialogCreateNewArtModule.class
 })
 public interface MainApplicationComponent {
 
@@ -365,6 +368,8 @@ public interface MainApplicationComponent {
 
     DialogAskVettoreComponent.Factory dialogAskVettoreComponent();
 
+    DialogCreateNewArtComponent.Factory dialogCreateNewArtComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
index f17ece86..0fdf8ca2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
@@ -111,6 +111,28 @@ public class Converters {
         }
     }
 
+    @BindingAdapter("binding")
+    public static void bindEditText(AppCompatTextView view, final ValidatableObservableField<String> observableField) {
+        Pair<ValidatableObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableField) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    if (observableField != null) observableField.set(s.toString());
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableField, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        String newValue = observableField.get();
+        if (!view.getText().toString().equals(newValue)) {
+            view.setText(newValue);
+        }
+    }
+
     @BindingAdapter("binding")
     public static void bindEditText(EditText view, final BindableString bindableString) {
         Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -156,6 +178,28 @@ public class Converters {
         }
     }
 
+    @BindingAdapter("binding")
+    public static void bindEditText(EditText view, final ValidatableObservableField<String> observableString) {
+        Pair<ValidatableObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableString) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    observableString.set(s.toString());
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableString, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        String newValue = observableString.get();
+        if (!view.getText().toString().equals(newValue)) {
+            view.setText(newValue);
+        }
+    }
+
     @BindingAdapter("binding")
     public static void bindEditText(AutoCompleteTextView view, final ObservableField<String> observableString) {
         Pair<ObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -260,6 +304,36 @@ public class Converters {
         }
     }
 
+    @BindingAdapter("binding")
+    public static void bindTextInputEditTextBigDecimal(EditText view, final ValidatableObservableField<BigDecimal> observableBigDecimal) {
+        Pair<ValidatableObservableField<BigDecimal>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableBigDecimal) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    BigDecimal value = null;
+                    String newValueString = s.toString().trim();
+
+                    if (!UtilityString.isNullOrEmpty(newValueString))
+                        value = new BigDecimal(newValueString);
+
+                    observableBigDecimal.set(value);
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableBigDecimal, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        BigDecimal newValue = observableBigDecimal.get();
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
+
+        if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
+            view.setText(UtilityNumber.decimalToString(newValue));
+        }
+    }
+
     @BindingAdapter("binding")
     public static void bindTextInputEditTextBigDecimal(TextInputEditText view, final BindableBigDecimal bindableBigDecimal) {
         Pair<BindableBigDecimal, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -657,6 +731,30 @@ public class Converters {
         view.setChecked(newValue);
     }
 
+    @BindingAdapter("checked")
+    public static void bindCheckbox(AppCompatCheckBox view, final ObservableField<Boolean> bindableBoolean) {
+        if (view.getTag(R.id.bound_observable) != bindableBoolean) {
+            view.setTag(R.id.bound_observable, bindableBoolean);
+            view.setOnCheckedChangeListener((compoundButton, b) -> {
+                bindableBoolean.set(b);
+            });
+        }
+        Boolean newValue = bindableBoolean.get();
+        view.setChecked(newValue);
+    }
+
+    @BindingAdapter("checked")
+    public static void bindCheckbox(AppCompatCheckBox view, final ValidatableObservableField<Boolean> bindableBoolean) {
+        if (view.getTag(R.id.bound_observable) != bindableBoolean) {
+            view.setTag(R.id.bound_observable, bindableBoolean);
+            view.setOnCheckedChangeListener((compoundButton, b) -> {
+                bindableBoolean.set(b);
+            });
+        }
+        Boolean newValue = bindableBoolean.get();
+        view.setChecked(newValue);
+    }
+
     @BindingAdapter("checked")
     public static void bindCheckbox(CheckBox view, final BindableBoolean bindableBoolean) {
         if (view.getTag(R.id.bound_observable) != bindableBoolean) {
@@ -723,8 +821,8 @@ public class Converters {
 
     @BindingAdapter({"reverse_visibility"})
     public static void bindViewReverseVisibility(View view, final BindableBoolean bindableBoolean) {
-        if (view.getTag(R.id.bound_observable) != bindableBoolean) {
-            view.setTag(R.id.bound_observable, bindableBoolean);
+        if (view.getTag(R.id.bound_reverse_visibility) != bindableBoolean) {
+            view.setTag(R.id.bound_reverse_visibility, bindableBoolean);
         }
         bindableBoolean.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
             @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/ValidatableObservableField.java b/app/src/main/java/it/integry/integrywmsnative/core/di/ValidatableObservableField.java
new file mode 100644
index 00000000..aec6c65c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/ValidatableObservableField.java
@@ -0,0 +1,65 @@
+package it.integry.integrywmsnative.core.di;
+
+import androidx.annotation.Nullable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.BR;
+import it.integry.integrywmsnative.core.di.validators.Validator;
+
+public class ValidatableObservableField<T> extends BaseObservable {
+    private T mValue;
+    private final List<Validator<T>> validators = new ArrayList<>();
+    public String errorMessage;
+
+    public ValidatableObservableField() {
+    }
+
+    public ValidatableObservableField(T value) {
+        mValue = value;
+    }
+
+    /**
+     * @return the stored value.
+     */
+    @Nullable
+    public T get() {
+        return mValue;
+    }
+
+    public void set(T value) {
+        if (value != mValue) {
+            mValue = value;
+            notifyChange();
+            validate();
+        }
+    }
+
+    public void addValidator(Validator<T> validator) {
+        validators.add(validator);
+    }
+
+    public boolean validate() {
+        for (Validator<T> validator : validators) {
+            if (!validator.isValid(mValue)) {
+                setErrorMessage(validator.getErrorMessage());
+                return false;
+            }
+        }
+        setErrorMessage(null);
+        return true;
+    }
+
+    @Bindable
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    private void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+        notifyPropertyChanged(BR.errorMessage); // Notifica il cambiamento di errorMessage
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/AutoCompleteTextViewBinders.java b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/AutoCompleteTextViewBinders.java
index a09b4af8..d9f5fba5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/AutoCompleteTextViewBinders.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/AutoCompleteTextViewBinders.java
@@ -2,5 +2,25 @@ package it.integry.integrywmsnative.core.di.binders;
 
 public class AutoCompleteTextViewBinders {
 
-
+//    @BindingAdapter("binding")
+//    public static void bindUntMisText(AppCompatAutoCompleteTextView view, ObservableField<MtbUntMis> untMisField) {
+//        Pair<ObservableField<MtbUntMis>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+//        if (pair == null || pair.first != untMisField) {
+//            if (pair != null) {
+//                view.removeTextChangedListener(pair.second);
+//            }
+//            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+//                @Override
+//                public void onTextChanged(CharSequence s, int start, int before, int count) {
+//                    if (untMisField != null) untMisField.set(s.toString());
+//                }
+//            };
+//            view.setTag(R.id.bound_observable, new Pair<>(untMisField, watcher));
+//            view.addTextChangedListener(watcher);
+//        }
+//        String newValue = untMisField != null && untMisField.get() != null ? Objects.requireNonNull(untMisField.get()).getUntMis() : "";
+//        if (!view.getText().toString().equals(newValue)) {
+//            view.setText(newValue);
+//        }
+//    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java
index cc974d49..4da2a6bd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java
@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.di.binders;
 
 import androidx.databinding.BindingAdapter;
+
 import com.google.android.material.textfield.TextInputLayout;
 
 public class TextInputLayoutBinders {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/validators/GreaterThenValidator.java b/app/src/main/java/it/integry/integrywmsnative/core/di/validators/GreaterThenValidator.java
new file mode 100644
index 00000000..cddbd5f5
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/validators/GreaterThenValidator.java
@@ -0,0 +1,23 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+import java.math.BigDecimal;
+
+public class GreaterThenValidator  implements Validator<BigDecimal> {
+    private final String errorMessage;
+    private final BigDecimal greaterThanValue;
+
+    public GreaterThenValidator(BigDecimal greaterThanValue, String errorMessage) {
+        this.greaterThanValue = greaterThanValue;
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public boolean isValid(BigDecimal value) {
+        return value != null && value.compareTo(greaterThanValue) > 0;
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/validators/MinLengthValidator.java b/app/src/main/java/it/integry/integrywmsnative/core/di/validators/MinLengthValidator.java
new file mode 100644
index 00000000..cb5fef92
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/validators/MinLengthValidator.java
@@ -0,0 +1,21 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+public class MinLengthValidator implements Validator<String> {
+    private final int minLength;
+    private final String errorMessage;
+
+    public MinLengthValidator(int minLength, String errorMessage) {
+        this.minLength = minLength;
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public boolean isValid(String value) {
+        return value != null && value.length() >= minLength;
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/validators/NotEmptyValidator.java b/app/src/main/java/it/integry/integrywmsnative/core/di/validators/NotEmptyValidator.java
new file mode 100644
index 00000000..5a5d88f2
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/validators/NotEmptyValidator.java
@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+public class NotEmptyValidator implements Validator<String> {
+    private final String errorMessage;
+
+    public NotEmptyValidator(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public boolean isValid(String value) {
+        return value != null && !value.trim().isEmpty();
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/validators/NotNullValidator.java b/app/src/main/java/it/integry/integrywmsnative/core/di/validators/NotNullValidator.java
new file mode 100644
index 00000000..5e2f74c2
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/validators/NotNullValidator.java
@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+public class NotNullValidator<T> implements Validator<T>{
+    private final String errorMessage;
+
+    public NotNullValidator(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public boolean isValid(T value) {
+        return value != null;
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/validators/Validator.java b/app/src/main/java/it/integry/integrywmsnative/core/di/validators/Validator.java
new file mode 100644
index 00000000..34ec0631
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/validators/Validator.java
@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+public interface Validator<T> {
+    boolean isValid(T value);
+
+    String getErrorMessage();
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbGrup.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbGrup.java
index 28e83607..e3754b57 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbGrup.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbGrup.java
@@ -1,5 +1,8 @@
 package it.integry.integrywmsnative.core.model;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MtbGrup extends EntityBase {
 
     private String codMgrp;
@@ -8,6 +11,7 @@ public class MtbGrup extends EntityBase {
     private String logoWeb;
     private String criterioVal;
     private String tipoMgrp;
+    private List<MtbSgrp> mtbSgrp = new ArrayList<>();
 
     public MtbGrup() {
         this.type = "mtb_grup";
@@ -66,4 +70,13 @@ public class MtbGrup extends EntityBase {
         this.tipoMgrp = tipoMgrp;
         return this;
     }
+
+    public List<MtbSgrp> getMtbSgrp() {
+        return mtbSgrp;
+    }
+
+    public MtbGrup setMtbSgrp(List<MtbSgrp> mtbSgrp) {
+        this.mtbSgrp = mtbSgrp;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbSfam.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbSfam.java
new file mode 100644
index 00000000..611ac1a5
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbSfam.java
@@ -0,0 +1,49 @@
+package it.integry.integrywmsnative.core.model;
+
+public class MtbSfam extends EntityBase {
+
+    private String codMgrp;
+    private String codMsgr;
+    private String codMsfa;
+    private String descrizione;
+
+    public MtbSfam() {
+        this.type = "mtb_sfam";
+    }
+
+    public String getCodMgrp() {
+        return codMgrp;
+    }
+
+    public MtbSfam setCodMgrp(String codMgrp) {
+        this.codMgrp = codMgrp;
+        return this;
+    }
+
+    public String getCodMsgr() {
+        return codMsgr;
+    }
+
+    public MtbSfam setCodMsgr(String codMsgr) {
+        this.codMsgr = codMsgr;
+        return this;
+    }
+
+    public String getCodMsfa() {
+        return codMsfa;
+    }
+
+    public MtbSfam setCodMsfa(String codMsfa) {
+        this.codMsfa = codMsfa;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public MtbSfam setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbSgrp.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbSgrp.java
new file mode 100644
index 00000000..793b5fbd
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbSgrp.java
@@ -0,0 +1,112 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MtbSgrp extends EntityBase {
+
+    private String codMgrp;
+    private String codMsgr;
+    private String descrizione;
+    private String inclInStat;
+    private String contoRimFin;
+    private Integer ordinamento;
+    private Boolean chkGiacenzaNeg;
+    private Boolean flagReso;
+    private String codCconWip;
+    private List<MtbSfam> mtbSfam = new ArrayList<>();
+
+    public MtbSgrp() {
+        this.type = "mtb_sgrp";
+    }
+
+    public String getCodMgrp() {
+        return codMgrp;
+    }
+
+    public MtbSgrp setCodMgrp(String codMgrp) {
+        this.codMgrp = codMgrp;
+        return this;
+    }
+
+    public String getCodMsgr() {
+        return codMsgr;
+    }
+
+    public MtbSgrp setCodMsgr(String codMsgr) {
+        this.codMsgr = codMsgr;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public MtbSgrp setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public String getInclInStat() {
+        return inclInStat;
+    }
+
+    public MtbSgrp setInclInStat(String inclInStat) {
+        this.inclInStat = inclInStat;
+        return this;
+    }
+
+    public String getContoRimFin() {
+        return contoRimFin;
+    }
+
+    public MtbSgrp setContoRimFin(String contoRimFin) {
+        this.contoRimFin = contoRimFin;
+        return this;
+    }
+
+    public Integer getOrdinamento() {
+        return ordinamento;
+    }
+
+    public MtbSgrp setOrdinamento(Integer ordinamento) {
+        this.ordinamento = ordinamento;
+        return this;
+    }
+
+    public Boolean getChkGiacenzaNeg() {
+        return chkGiacenzaNeg;
+    }
+
+    public MtbSgrp setChkGiacenzaNeg(Boolean chkGiacenzaNeg) {
+        this.chkGiacenzaNeg = chkGiacenzaNeg;
+        return this;
+    }
+
+    public Boolean getFlagReso() {
+        return flagReso;
+    }
+
+    public MtbSgrp setFlagReso(Boolean flagReso) {
+        this.flagReso = flagReso;
+        return this;
+    }
+
+    public String getCodCconWip() {
+        return codCconWip;
+    }
+
+    public MtbSgrp setCodCconWip(String codCconWip) {
+        this.codCconWip = codCconWip;
+        return this;
+    }
+
+    public List<MtbSfam> getMtbSfam() {
+        return mtbSfam;
+    }
+
+    public MtbSgrp setMtbSfam(List<MtbSfam> mtbSfam) {
+        this.mtbSfam = mtbSfam;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
index 50577a84..87db9581 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
@@ -18,7 +18,10 @@ import it.integry.integrywmsnative.core.model.MtbUntMis;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.articolo.ArticoloDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.RetrieveArticoloByCodMartRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.SaveArticoloRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.SaveArticoloResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.UpdateBarcodeImballoRequestDTO;
@@ -36,6 +39,41 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
         this.systemRESTConsumer = systemRESTConsumer;
     }
 
+
+    public void retrieveAvailableUntMis(RunnableArgs<List<MtbUntMis>> onComplete, RunnableArgs<Exception> onFailed) {
+        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+        articoloRESTConsumerService
+                .retrieveAvailableUntMis()
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<MtbUntMis>> call, Response<ServiceRESTResponse<MtbUntMis>> response) {
+                        analyzeAnswerList(response, "retrieveAvailableUntMis", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<MtbUntMis>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    public void retrieveAvailableGruppiMerceologici(RunnableArgs<List<MtbGrup>> onComplete, RunnableArgs<Exception> onFailed) {
+        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+        articoloRESTConsumerService
+                .retrieveAvailableGruppiMerceologici()
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<MtbGrup>> call, Response<ServiceRESTResponse<MtbGrup>> response) {
+                        analyzeAnswerList(response, "retrieveAvailableGruppiMerceologici", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<MtbGrup>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
     public void searchByBarcode(String barcodeProd, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
         ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
 
@@ -205,4 +243,28 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
                     }
                 });
     }
+
+
+    public void saveArticolo(ArticoloDTO articoloToSave, RunnableArgs<String> onComplete, RunnableArgs<Exception> onFailed) {
+        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+
+        var request = new SaveArticoloRequestDTO()
+                .setArtToSave(articoloToSave);
+
+        articoloRESTConsumerService
+                .saveArticolo(request)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<SaveArticoloResponseDTO>> call, Response<ServiceRESTResponse<SaveArticoloResponseDTO>> response) {
+                        analyzeAnswer(response, "saveArticolo", data -> {
+                            onComplete.run(data.getCodMart());
+                        }, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<SaveArticoloResponseDTO>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java
index 7a4754a7..c497adc6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java
@@ -3,9 +3,13 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.MtbGrup;
+import it.integry.integrywmsnative.core.model.MtbUntMis;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.articolo.RetrieveArticoloByCodMartRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.SaveArticoloRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.SaveArticoloResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.UpdateBarcodeImballoRequestDTO;
@@ -17,6 +21,13 @@ import retrofit2.http.Query;
 
 public interface ArticoloRESTConsumerService {
 
+
+    @GET("wms/articolo/availableUntMis")
+    Call<ServiceRESTResponse<MtbUntMis>> retrieveAvailableUntMis();
+
+    @GET("wms/articolo/availableGruppiMerceologici")
+    Call<ServiceRESTResponse<MtbGrup>> retrieveAvailableGruppiMerceologici();
+
     @POST("wms/articolo/searchByBarcode")
     Call<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> searchByBarcode(@Body() SearchArticoloByBarcodeRequestDTO searchArticoloByBarcodeRequest);
 
@@ -29,4 +40,7 @@ public interface ArticoloRESTConsumerService {
     @GET("getProductLotStatus")
     Call<ServiceRESTResponse<List<StatoArticoloDTO>>> getStatoPartita(@Query("codMart") String codMart, @Query("partitaMag") String partitaMag);
 
+    @POST("wms/articolo/saveArticolo")
+    Call<ServiceRESTResponse<SaveArticoloResponseDTO>> saveArticolo(@Body SaveArticoloRequestDTO saveArticoloRequest);
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
index 4249e1fc..ab10d9d8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
@@ -286,7 +286,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
                 analyzeAnswer(response, "GetBySSCC", mtbColt -> {
 
-                    if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+                    if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
                         List<MtbColt> mtbColtList = new ArrayList<>();
                         mtbColtList.add(mtbColt);
                         fillMtbAartsOfMtbColts(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/ArticoloDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/ArticoloDTO.java
new file mode 100644
index 00000000..b6d8f64e
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/ArticoloDTO.java
@@ -0,0 +1,257 @@
+package it.integry.integrywmsnative.core.rest.model.articolo;
+
+import java.math.BigDecimal;
+
+public class ArticoloDTO {
+
+    private String codMart;
+    private String descrizione;
+    private String untMis;
+    private String barcode;
+    private BigDecimal qtaCnf;
+    private String codAliq;
+    private String articoloComposto;
+    private String descrizioneEstesa;
+    private String note;
+    private String posizione;
+    private String codMgrp;
+    private String codMsfa;
+    private String codMsgr;
+    private String codMstp;
+    private String codMtip;
+    private boolean flagStato;
+    private String barcodeImballo;
+    private String diacod;
+    private boolean flagQtaCnfFissa;
+    private String idArtEqui;
+    private boolean flagKit;
+    private String precode;
+    private String gruppo;
+    private String sottoGruppo;
+    private String sottoFamiglia;
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public ArticoloDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public ArticoloDTO setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public ArticoloDTO setUntMis(String untMis) {
+        this.untMis = untMis;
+        return this;
+    }
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public ArticoloDTO setBarcode(String barcode) {
+        this.barcode = barcode;
+        return this;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public ArticoloDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public String getCodAliq() {
+        return codAliq;
+    }
+
+    public ArticoloDTO setCodAliq(String codAliq) {
+        this.codAliq = codAliq;
+        return this;
+    }
+
+    public String getArticoloComposto() {
+        return articoloComposto;
+    }
+
+    public ArticoloDTO setArticoloComposto(String articoloComposto) {
+        this.articoloComposto = articoloComposto;
+        return this;
+    }
+
+    public String getDescrizioneEstesa() {
+        return descrizioneEstesa;
+    }
+
+    public ArticoloDTO setDescrizioneEstesa(String descrizioneEstesa) {
+        this.descrizioneEstesa = descrizioneEstesa;
+        return this;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public ArticoloDTO setNote(String note) {
+        this.note = note;
+        return this;
+    }
+
+    public String getPosizione() {
+        return posizione;
+    }
+
+    public ArticoloDTO setPosizione(String posizione) {
+        this.posizione = posizione;
+        return this;
+    }
+
+    public String getCodMgrp() {
+        return codMgrp;
+    }
+
+    public ArticoloDTO setCodMgrp(String codMgrp) {
+        this.codMgrp = codMgrp;
+        return this;
+    }
+
+    public String getCodMsfa() {
+        return codMsfa;
+    }
+
+    public ArticoloDTO setCodMsfa(String codMsfa) {
+        this.codMsfa = codMsfa;
+        return this;
+    }
+
+    public String getCodMsgr() {
+        return codMsgr;
+    }
+
+    public ArticoloDTO setCodMsgr(String codMsgr) {
+        this.codMsgr = codMsgr;
+        return this;
+    }
+
+    public String getCodMstp() {
+        return codMstp;
+    }
+
+    public ArticoloDTO setCodMstp(String codMstp) {
+        this.codMstp = codMstp;
+        return this;
+    }
+
+    public String getCodMtip() {
+        return codMtip;
+    }
+
+    public ArticoloDTO setCodMtip(String codMtip) {
+        this.codMtip = codMtip;
+        return this;
+    }
+
+    public boolean isFlagStato() {
+        return flagStato;
+    }
+
+    public ArticoloDTO setFlagStato(boolean flagStato) {
+        this.flagStato = flagStato;
+        return this;
+    }
+
+    public String getBarcodeImballo() {
+        return barcodeImballo;
+    }
+
+    public ArticoloDTO setBarcodeImballo(String barcodeImballo) {
+        this.barcodeImballo = barcodeImballo;
+        return this;
+    }
+
+    public String getDiacod() {
+        return diacod;
+    }
+
+    public ArticoloDTO setDiacod(String diacod) {
+        this.diacod = diacod;
+        return this;
+    }
+
+    public boolean isFlagQtaCnfFissa() {
+        return flagQtaCnfFissa;
+    }
+
+    public ArticoloDTO setFlagQtaCnfFissa(boolean flagQtaCnfFissa) {
+        this.flagQtaCnfFissa = flagQtaCnfFissa;
+        return this;
+    }
+
+    public String getIdArtEqui() {
+        return idArtEqui;
+    }
+
+    public ArticoloDTO setIdArtEqui(String idArtEqui) {
+        this.idArtEqui = idArtEqui;
+        return this;
+    }
+
+    public boolean isFlagKit() {
+        return flagKit;
+    }
+
+    public ArticoloDTO setFlagKit(boolean flagKit) {
+        this.flagKit = flagKit;
+        return this;
+    }
+
+    public String getPrecode() {
+        return precode;
+    }
+
+    public ArticoloDTO setPrecode(String precode) {
+        this.precode = precode;
+        return this;
+    }
+
+    public String getGruppo() {
+        return gruppo;
+    }
+
+    public ArticoloDTO setGruppo(String gruppo) {
+        this.gruppo = gruppo;
+        return this;
+    }
+
+    public String getSottoGruppo() {
+        return sottoGruppo;
+    }
+
+    public ArticoloDTO setSottoGruppo(String sottoGruppo) {
+        this.sottoGruppo = sottoGruppo;
+        return this;
+    }
+
+    public String getSottoFamiglia() {
+        return sottoFamiglia;
+    }
+
+    public ArticoloDTO setSottoFamiglia(String sottoFamiglia) {
+        this.sottoFamiglia = sottoFamiglia;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/SaveArticoloRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/SaveArticoloRequestDTO.java
new file mode 100644
index 00000000..c3b3952e
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/SaveArticoloRequestDTO.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.core.rest.model.articolo;
+
+public class SaveArticoloRequestDTO {
+    private ArticoloDTO artToSave;
+
+    public ArticoloDTO getArtToSave() {
+        return artToSave;
+    }
+
+    public SaveArticoloRequestDTO setArtToSave(ArticoloDTO artToSave) {
+        this.artToSave = artToSave;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/SaveArticoloResponseDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/SaveArticoloResponseDTO.java
new file mode 100644
index 00000000..58196cf6
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/SaveArticoloResponseDTO.java
@@ -0,0 +1,9 @@
+package it.integry.integrywmsnative.core.rest.model.articolo;
+
+public class SaveArticoloResponseDTO {
+    private String codMart;
+
+    public String getCodMart() {
+        return codMart;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index d0e0c679..ba237dd3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -83,6 +83,8 @@ public class DBSettingsModel {
     private boolean suggestDataScad = false;
     private boolean flagPositionChangeRequest = false;
     private String docInterniRequestNumDoc;
+    private boolean flagEnableArtCreation;
+    private List<String> allowedCodMgrpForArtCreation;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -705,6 +707,24 @@ public class DBSettingsModel {
         return this;
     }
 
+    public List<String> getAllowedCodMgrpForArtCreation() {
+        return allowedCodMgrpForArtCreation;
+    }
+
+    public DBSettingsModel setAllowedCodMgrpForArtCreation(List<String> allowedCodMgrpForArtCreation) {
+        this.allowedCodMgrpForArtCreation = allowedCodMgrpForArtCreation;
+        return this;
+    }
+
+    public boolean isFlagEnableArtCreation() {
+        return flagEnableArtCreation;
+    }
+
+    public DBSettingsModel setFlagEnableArtCreation(boolean flagEnableArtCreation) {
+        this.flagEnableArtCreation = flagEnableArtCreation;
+        return this;
+    }
+
     public boolean isFlagPositionChangeRequest() {
         return flagPositionChangeRequest;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index 6350c3da..5b59af13 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -569,6 +569,21 @@ public class SettingsManager {
                 .setKeySection("REQUEST_NUM_DOC")
                 .setSetter(dbSettingsModelIstance::setDocInterniRequestNumDoc));
 
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .setKeySection("ENABLE_ART_CREATION")
+                .setSetter(dbSettingsModelIstance::setFlagEnableArtCreation));
+
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .setKeySection("ENABLE_ART_CREATION_GRP_MERC")
+                .setSetter(data -> {
+                    if (data != null)
+                        dbSettingsModelIstance.setAllowedCodMgrpForArtCreation(Arrays.asList(data.split("\\|")));
+                }));
+
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java
index 2d8bec0e..febdf753 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java
@@ -1,6 +1,12 @@
 package it.integry.integrywmsnative.core.utility;
 
+import android.graphics.Bitmap;
+import android.graphics.Color;
+
 import com.annimon.stream.Stream;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.common.BitMatrix;
 
 import java.util.Calendar;
 
@@ -109,12 +115,12 @@ public class UtilityBarcode {
     }
 
 
-    public static String convertITF14toEAN13(String barcodeITF14) {
+    public static String convertITF14toEAN13(String barcodeITF14) throws Exception {
         String barcodeEAN13 = null;
 
         if (barcodeITF14.length() == 14) {
             barcodeEAN13 = barcodeITF14.substring(1, barcodeITF14.length() - 1).trim();
-            barcodeEAN13 += getEAN13CheckDigit(barcodeEAN13);
+            barcodeEAN13 += calculateEAN13CheckDigit(barcodeEAN13);
         }
 
         return barcodeEAN13;
@@ -131,18 +137,69 @@ public class UtilityBarcode {
     }
 
 
-    private static String getEAN13CheckDigit(String ean) {
-
-        if (ean.length() != 12) {
-            UtilityLogger.error(new Exception("Please provide an input string of 12 chars. Current lenght: " + ean.length()));
-            return null;
+    public static boolean isValidEan13(String ean13) {
+        // Verifica che il codice sia lungo esattamente 13 cifre
+        if (ean13.length() != 13 || !ean13.matches("\\d+")) {
+            return false;
         }
-        long tot = 0;
 
-        for (int i = 0; i < 12; i++) {
-            tot = tot + (Long.parseLong(String.valueOf(ean.charAt(i))) * (i % 2 == 0 ? 1 : 3));
-        }
-        return tot % 10 == 0 ? "0" : "" + (10 - (tot % 10));
+        // Calcola il check digit dalle prime 12 cifre
+        int calculatedCheckDigit = calculateEAN13CheckDigit(ean13.substring(0, 12));
+        int providedCheckDigit = Character.getNumericValue(ean13.charAt(12));
+
+        // Confronta il check digit calcolato con quello fornito
+        return calculatedCheckDigit == providedCheckDigit;
     }
 
+    private static int calculateEAN13CheckDigit(String ean12) {
+        int sum = 0;
+        for (int i = 0; i < ean12.length(); i++) {
+            int digit = Character.getNumericValue(ean12.charAt(i));
+            sum += (i % 2 == 0) ? digit : digit * 3;
+        }
+        return (10 - (sum % 10)) % 10;
+    }
+
+    public static Bitmap generateBarcodeImage(String barcode, int width, int height) throws Exception {
+        if(barcode == null) return null;
+
+        BarcodeType barcodeType;
+
+        if(barcode.length() == 8)
+            barcodeType = BarcodeType.EAN8;
+        else if(barcode.length() == 13)
+            barcodeType = BarcodeType.EAN13;
+        else if(barcode.length() == 14)
+            barcodeType = BarcodeType.INTERLEAVED_2OF5;
+        else throw new Exception("Barcode " + barcode + " non valido");
+
+        return generateBarcodeImage(barcode, barcodeType, width, height);
+    }
+
+    public static Bitmap generateBarcodeImage(String barcode, BarcodeType type, int width, int height) throws Exception {
+        // Genera la matrice del codice a barre
+        MultiFormatWriter writer = new MultiFormatWriter();
+
+        BarcodeFormat barcodeFormat = switch (type) {
+            case EAN8 -> BarcodeFormat.EAN_8;
+            case EAN13 -> BarcodeFormat.EAN_13;
+            case INTERLEAVED_2OF5 -> BarcodeFormat.ITF;
+            case CODE128 -> BarcodeFormat.CODE_128;
+            default -> throw new Exception("Barcode " + barcode + " non valido (tipo: " + type + ")");
+        };
+
+        BitMatrix bitMatrix = writer.encode(barcode, barcodeFormat, width, height);
+
+        // Crea un bitmap a partire dalla matrice
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        for (int x = 0; x < width; x++) {
+            for (int y = 0; y < height; y++) {
+                bitmap.setPixel(x, y, bitMatrix.get(x, y) ? Color.BLACK : Color.WHITE);
+            }
+        }
+
+        return bitmap;
+    }
+
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityObservable.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityObservable.java
index 6861738f..f16c98c4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityObservable.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityObservable.java
@@ -1,9 +1,16 @@
 package it.integry.integrywmsnative.core.utility;
 
 import androidx.databinding.Observable;
+import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableField;
+import androidx.databinding.ObservableList;
 
+import java.util.stream.Collectors;
+
+import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
+import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.RunnableArgsWithReturn;
 
 public class UtilityObservable {
 
@@ -16,4 +23,36 @@ public class UtilityObservable {
         });
     }
 
+    public static <T, R> ObservableField<R> convertObservable(ObservableField<T> observableField, RunnableArgsWithReturn<T, R> dataConverter) {
+        ObservableField<R> returnObservable = new ObservableField<>();
+
+        observableField.addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                returnObservable.set(dataConverter.run(observableField.get()));
+            }
+        });
+
+        returnObservable.set(dataConverter.run(observableField.get()));
+
+        return returnObservable;
+    }
+
+    public static <T, R> ObservableArrayList<R> convertObservableArrayList(ObservableArrayList<T> observableField, RunnableArgsWithReturn<T, R> dataConverter) {
+        ObservableArrayList<R> returnObservable = new ObservableArrayList<>();
+
+        observableField.addOnListChangedCallback(new OnListGeneralChangedCallback<T>() {
+            @Override
+            public void onChanged(ObservableList<T> sender) {
+
+                returnObservable.clear();
+                returnObservable.addAll(sender.stream().map(dataConverter::run).collect(Collectors.toUnmodifiableList()));
+            }
+        });
+
+        returnObservable.addAll(observableField.stream().map(dataConverter::run).collect(Collectors.toUnmodifiableList()));
+
+        return returnObservable;
+    }
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
index 737f80ad..832d6547 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
@@ -195,6 +195,9 @@ public class ProdRecuperoMaterialeViewModel {
                 mtbColtScarico.getMtbColr().add(mtbColrScarico);
             }
         } else {
+
+
+
             BigDecimal qtaColToSave;
             BigDecimal numCnfToSave;
             if (SettingsManager.iDB().isFlagForceAllToColli() || (item.getMtbAart() != null && !item.getMtbAart().isFlagQtaCnfFissaBoolean())) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java
index f01b9cef..e14a5f8f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java
@@ -97,7 +97,7 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi
         }
         String testataOrdString = String.format(this.getString(R.string.ord_acq_testata), ordine.getOrdineId(), UtilityDate.formatDate(ordine.getDataIns(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
         mBinding.orderIdentifier.setText(Html.fromHtml(testataOrdString));
-        FabMenuCustomAnimations.changeIconOnFocus(mBinding.closeActivityFab, R.drawable.ic_check_white_24dp, R.drawable.ic_close_24dp);
+        FabMenuCustomAnimations.changeIconOnFocus(mBinding.closeActivityFab, R.drawable.ic_round_check_24, R.drawable.ic_close_24dp);
 
 
         initBarcodeReader();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java
index 27dfbdca..51f1c221 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java
@@ -15,8 +15,6 @@ import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.core.content.ContextCompat;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableField;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
@@ -63,6 +61,7 @@ import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArtsView;
+import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUView;
@@ -142,7 +141,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                              Bundle savedInstanceState) {
 
         setRetainInstance(true);
-        mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_main_rettifica_giacenze, container, false);
+        mBinding = FragmentMainRettificaGiacenzeBinding.inflate(inflater, container, false);
 
 
         mBinding.setLifecycleOwner(this);
@@ -205,15 +204,18 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
     private void init() {
         mBinding.autoCompleteFornitori.setOnFocusChangeListener((v, hasFocus) -> {
-            setUIToForn();
+            if (hasFocus)
+                setUIToForn();
         });
 
         mBinding.inputCodArtDescrForn.setOnFocusChangeListener((v, hasFocus) -> {
-            setUIToForn();
+            if (hasFocus)
+                setUIToForn();
         });
 
         mBinding.inputCodArtDescrInt.setOnFocusChangeListener((v, hasFocus) -> {
-            setUIToIntArt();
+            if (hasFocus)
+                setUIToIntArt();
         });
 
         mViewModel.init(
@@ -238,23 +240,30 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
     public void setUIToForn() {
         mBinding.rettificaGiacenzeFornCheckBox.setChecked(true);
-        mBinding.rettificaGiacenzeFornLayout.setBackground(ResourcesCompat.getDrawable(getActivity().getResources(), R.drawable.circular_background_left, null));
         mBinding.rettificaGiacenzeFornLayout.setBackgroundTintList(ColorStateList.valueOf(getActivity().getResources().getColor(R.color.alpha_blue_500)));
 
         mBinding.rettificaGiacenzeArtIntCheckBox.setChecked(false);
-        mBinding.rettificaGiacenzeArtIntLayout.setBackground(null);
         mBinding.rettificaGiacenzeArtIntLayout.setBackgroundTintList(null);
+
+        mBinding.inputCodArtDescrInt.clearFocus();
+
+        if (!mBinding.inputCodArtDescrForn.hasFocus() && !mBinding.autoCompleteFornitori.hasFocus()) {
+            mBinding.inputCodArtDescrForn.clearFocus();
+            mBinding.autoCompleteFornitori.requestFocusFromTouch();
+        }
     }
 
 
     public void setUIToIntArt() {
         mBinding.rettificaGiacenzeArtIntCheckBox.setChecked(true);
-        mBinding.rettificaGiacenzeArtIntLayout.setBackground(ResourcesCompat.getDrawable(getActivity().getResources(), R.drawable.circular_background_left, null));
         mBinding.rettificaGiacenzeArtIntLayout.setBackgroundTintList(ColorStateList.valueOf(getActivity().getResources().getColor(R.color.alpha_blue_500)));
 
         mBinding.rettificaGiacenzeFornCheckBox.setChecked(false);
-        mBinding.rettificaGiacenzeFornLayout.setBackground(null);
         mBinding.rettificaGiacenzeFornLayout.setBackgroundTintList(null);
+
+        mBinding.inputCodArtDescrForn.clearFocus();
+        mBinding.autoCompleteFornitori.clearFocus();
+        mBinding.inputCodArtDescrInt.requestFocusFromTouch();
     }
 
     @Override
@@ -295,13 +304,22 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                     return true;
                 }
 
-                mViewModel.searchArtInt(mBinding.inputCodArtDescrInt.getText().toString(), null);
+                mViewModel.searchArtInt(mBinding.inputCodArtDescrInt.getText().toString(), null, null);
                 return true;
             }
             return false;
         });
     }
 
+    @Override
+    public void onRequestNewArtCreation(String description, BarcodeScanDTO barcode) {
+        DialogCreateNewArtView.newInstance(description, barcode, currentMtbColtObs.get().getPosizione(),
+                        createdCodMart -> {
+                            mViewModel.searchArtInt(createdCodMart, null, null);
+                        })
+                .show(requireActivity().getSupportFragmentManager(), "tag");
+    }
+
     @Override
     public void onArtListLoaded(ArrayList<MtbAart> artList, RunnableArgs<MtbAart> onArtChoosed) {
         new DialogChooseArtFromListaArtsView(true, artList, onArtChoosed)
@@ -418,10 +436,11 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                             onComplete.run(pickedQuantityDTO, shouldCloseLU);
                         })
                         .show(requireActivity().getSupportFragmentManager(), "tag");
-        }, () -> {});
+        }, () -> {
+        });
     }
 
-    private void checkIfItemIsActive(String flagStato, String codMart, Runnable onContinue, Runnable onNegativeClick){
+    private void checkIfItemIsActive(String flagStato, String codMart, Runnable onContinue, Runnable onNegativeClick) {
         if (flagStato.equalsIgnoreCase("I")) {
             DialogSimpleMessageView.makeWarningDialog(
                             new SpannableString(Html.fromHtml(String.format(UtilityResources.getString(R.string.item_not_enabled), codMart))),
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
index 3f2a77b6..c8cbea23 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
@@ -111,7 +111,10 @@ public class RettificaGiacenzeViewModel {
 
 
     public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
-        if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
+        if(UtilityBarcode.isEtichettaPosizione(barcodeScanDTO)) {
+            //Not implemented now
+            onComplete.run();
+        } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
             //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
             this.executeEtichettaEan128(barcodeScanDTO, onComplete);
 
@@ -120,7 +123,7 @@ public class RettificaGiacenzeViewModel {
             this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);
 
         } else if (UtilityBarcode.isEtichettaArt(barcodeScanDTO)) {
-            this.searchArtInt(barcodeScanDTO.getStringValue(), onComplete);
+            this.searchArtInt(null, barcodeScanDTO, onComplete);
 
         } else {
             onComplete.run();
@@ -145,9 +148,9 @@ public class RettificaGiacenzeViewModel {
             if (!UtilityString.isNullOrEmpty(barcodeProd)) {
 
                 PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
-                this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
+                this.loadArticolo(barcodeProd, pickDataDTO, barcodeScanDTO, onComplete);
             } else if (!UtilityString.isNullOrEmpty(codMart)) {
-                this.searchArtInt(codMart, onComplete);
+                this.searchArtInt(codMart, barcodeScanDTO, onComplete);
             } else {
                 //EAN 128 non completo o comunque mancano i riferimenti al prodotto
                 onComplete.run();
@@ -158,18 +161,18 @@ public class RettificaGiacenzeViewModel {
     private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
         try {
             Ean13PesoModel ean13PesoModel = Ean13PesoModel.fromBarcode(barcodeScanDTO.getStringValue());
-            this.loadArticolo(ean13PesoModel.getPrecode(), PickDataDTO.fromEan128(ean13PesoModel.toEan128()), onComplete);
+            this.loadArticolo(ean13PesoModel.getPrecode(), PickDataDTO.fromEan128(ean13PesoModel.toEan128()), barcodeScanDTO, onComplete);
         } catch (Exception ex) {
             this.sendError(ex);
         }
     }
 
-    private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) {
+    private void loadArticolo(String barcodeProd, PickDataDTO pickData, BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
         this.mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> {
             if (onComplete != null) onComplete.run();
 
             if (mtbAartList != null && !mtbAartList.isEmpty()) {
-                this.dispatchArts(mtbAartList, pickData);
+                this.dispatchArts(mtbAartList, pickData, null, barcodeScanDTO);
             } else {
                 this.sendError(new NoResultFromBarcodeException(barcodeProd));
             }
@@ -190,25 +193,28 @@ public class RettificaGiacenzeViewModel {
                         .map(x -> (MtbAart) x.getMtbAart())
                         .toList();
 
-            dispatchArts(mtbAarts, null);
+            dispatchArts(mtbAarts, null, queryText, null);
         }, this::sendError);
     }
 
-    public void searchArtInt(String queryText, Runnable onComplete) {
+    public void searchArtInt(String queryText, BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
         this.sendOnLoadingStarted();
 
-        mRettificaGiacenzeRESTConsumer.searchArtInt(queryText, listaArts -> {
+        mRettificaGiacenzeRESTConsumer.searchArtInt(UtilityString.isNull(queryText, barcodeScanDTO.getStringValue()), listaArts -> {
             this.sendOnLoadingEnded();
 
-            dispatchArts(listaArts, null);
+            dispatchArts(listaArts, null, queryText, barcodeScanDTO);
 
             if (onComplete != null) onComplete.run();
         }, this::sendError);
     }
 
-    private void dispatchArts(List<MtbAart> artsList, PickDataDTO pickData) {
-        if (artsList == null || artsList.size() == 0) {
-            this.sendError(new NoArtsFoundException());
+    private void dispatchArts(List<MtbAart> artsList, PickDataDTO pickData, String description, BarcodeScanDTO barcodeProd) {
+        if (artsList == null || artsList.isEmpty()) {
+            if(SettingsManager.iDB().isFlagEnableArtCreation())
+                this.sendRequestNewArtCreation(description, barcodeProd);
+            else
+                this.sendError(new NoArtsFoundException());
             return;
         }
 
@@ -556,8 +562,6 @@ public class RettificaGiacenzeViewModel {
     private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
         this.sendOnLoadingStarted();
 
-//        if(!mIsCreatedLU && mCurrentMtbColt.isDocumentPresent()) {
-
         this.mColliMagazzinoRESTConsumer.creaRettificaCollo(
                 mtbColrToUpdate,
                 numCnf,
@@ -579,47 +583,6 @@ public class RettificaGiacenzeViewModel {
                 },
                 this::sendError
         );
-
-//        } else {
-//
-//            MtbColt mtbColt = new MtbColt()
-//                    .setNumCollo(mtbColrToUpdate.getNumCollo())
-//                    .setDataCollo(mtbColrToUpdate.getDataColloS())
-//                    .setSerCollo(mtbColrToUpdate.getSerCollo())
-//                    .setGestione(mtbColrToUpdate.getGestione())
-//                    .setMtbColr(new ObservableArrayList<>());
-//            mtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP);
-//
-//            final MtbColr mtbColr = (MtbColr) mtbColrToUpdate.clone();
-//            mtbColr
-//                    .setNumCnf(numCnf.subtract(mtbColr.getNumCnf()))
-//                    .setQtaCnf(qtaCnf)
-//                    .setQtaCol(qtaTot.subtract(mtbColr.getQtaCol()))
-//                    .setPartitaMag(partitaMag)
-//                    .setDataScadPartita(dataScad)
-//                    .setUtente(SettingsManager.i().getUser().getFullname())
-//                    .setCausale(MtbColr.Causale.RETTIFICA)
-//                    .setDatetimeRow(UtilityDate.getDateInstance())
-//                    .setOperation(CommonModelConsts.OPERATION.INSERT);
-//
-//            mtbColt.getMtbColr().add(mtbColr);
-//
-//            this.mColliMagazzinoRESTConsumer.saveCollo(mtbColt, (value) -> {
-//
-//                mtbColr.setNumCnf(numCnf)
-//                        .setQtaCnf(qtaCnf)
-//                        .setQtaCol(qtaTot);
-//
-//                this.mCurrentMtbColt.getMtbColr().remove(mtbColrToUpdate);
-//                this.mCurrentMtbColt.getMtbColr().add(mtbColr);
-//
-//                this.mAnyEditDone = true;
-//
-//                this.sendOnRowSaved();
-//                this.sendOnLoadingEnded();
-//
-//            }, this::sendError);
-//        }
     }
 
     public void deleteRow(MtbColr mtbColrToDelete) {
@@ -627,7 +590,6 @@ public class RettificaGiacenzeViewModel {
             if (shouldDelete) {
                 this.sendOnLoadingStarted();
 
-//                if(!mIsCreatedLU && mCurrentMtbColt.isDocumentPresent()) {
                 this.mColliMagazzinoRESTConsumer.creaRettificaCollo(
                         mtbColrToDelete,
                         BigDecimal.ZERO,
@@ -639,37 +601,6 @@ public class RettificaGiacenzeViewModel {
                         },
                         this::sendError
                 );
-//                } else {
-//                    MtbColt mtbColt = new MtbColt()
-//                            .setNumCollo(mtbColrToDelete.getNumCollo())
-//                            .setDataCollo(mtbColrToDelete.getDataColloS())
-//                            .setSerCollo(mtbColrToDelete.getSerCollo())
-//                            .setGestione(mtbColrToDelete.getGestione())
-//                            .setMtbColr(new ObservableArrayList<>());
-//                    mtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP);
-//
-//                    MtbColr mtbColr = (MtbColr) mtbColrToDelete.clone();
-//                    mtbColr
-//                            .setNumCnf(mtbColr.getNumCnf().multiply(new BigDecimal(-1)))
-//                            .setQtaCnf(mtbColr.getQtaCnf())
-//                            .setQtaCol(mtbColr.getQtaCol().multiply(new BigDecimal(-1)))
-//                            .setPartitaMag(mtbColr.getPartitaMag())
-//                            .setDataScadPartita(mtbColr.getDataScadPartitaD())
-//                            .setUtente(SettingsManager.i().getUser().getFullname())
-//                            .setCausale(MtbColr.Causale.RETTIFICA)
-//                            .setDatetimeRow(UtilityDate.getDateInstance())
-//                            .setOperation(CommonModelConsts.OPERATION.INSERT);
-//
-//                    mtbColt.getMtbColr().add(mtbColr);
-//
-//                    this.mColliMagazzinoRESTConsumer.saveCollo(mtbColt, (value) -> {
-//                        this.mCurrentMtbColt.getMtbColr().remove(mtbColrToDelete);
-//
-//                        this.sendOnRowSaved();
-//                        this.sendOnLoadingEnded();
-//
-//                    }, this::sendError);
-//                }
             }
         });
     }
@@ -686,6 +617,10 @@ public class RettificaGiacenzeViewModel {
         if (this.mListener != null) mListener.onFornitoriLoaded(fornitoriList);
     }
 
+    private void sendRequestNewArtCreation(String description, BarcodeScanDTO barcode) {
+        if(this.mListener != null) mListener.onRequestNewArtCreation(description, barcode);
+    }
+
 
     private void sendOnArtListLoaded(ArrayList<MtbAart> artList, RunnableArgs<MtbAart> onArtChoosed) {
         if (this.mListener != null) mListener.onArtListLoaded(artList, onArtChoosed);
@@ -777,6 +712,8 @@ public class RettificaGiacenzeViewModel {
 
         void onFornitoriLoaded(ArrayList<FornitoreDTO> fornitoriList);
 
+        void onRequestNewArtCreation(String description, BarcodeScanDTO barcode);
+
         void onArtListLoaded(ArrayList<MtbAart> artList, RunnableArgs<MtbAart> onArtChoosed);
 
         void onLUOpenRequest(boolean enableCreation, boolean checkIfDocumentExists, boolean warnOnOpeningVendita, RunnableArgss<MtbColt, Boolean> onComplete);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/dialog/DialogUltimeConsegneFiltroAvanzato.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/dialog/DialogUltimeConsegneFiltroAvanzato.java
index 21907134..b072fe8f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/dialog/DialogUltimeConsegneFiltroAvanzato.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/dialog/DialogUltimeConsegneFiltroAvanzato.java
@@ -104,7 +104,8 @@ public class DialogUltimeConsegneFiltroAvanzato {
 
     private void initView(DialogUltimeConsegneFiltroAvanzatoBinding bindings, DialogUltimeConsegneFiltroAvanzatoViewModel viewModel) {
 
-        arrayAdapterRagSoc = new SimpleAutoCompleteDropdownAdapter(mContext, R.layout.dialog_vendita_filtro_avanzato__single_item, getAvailableRagSocs(false));
+        arrayAdapterRagSoc = new SimpleAutoCompleteDropdownAdapter<>(mContext, R.layout.dialog_vendita_filtro_avanzato__single_item, getAvailableRagSocs(false));
+        arrayAdapterRagSoc.addAll();
         bindings.filledExposedDropdownRagSoc.setAdapter(arrayAdapterRagSoc);
 
         bindings.filledExposedDropdownDataDoc.setOnClickListener(view -> {
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteDropdownAdapter.java b/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteDropdownAdapter.java
index f2e665d4..d3d62fd0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteDropdownAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteDropdownAdapter.java
@@ -1,105 +1,116 @@
 package it.integry.integrywmsnative.ui.adapter;
 
 import android.content.Context;
+import android.view.LayoutInflater;
 import android.widget.ArrayAdapter;
 import android.widget.Filter;
 
 import androidx.annotation.NonNull;
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-public class SimpleAutoCompleteDropdownAdapter extends ArrayAdapter {
+public class SimpleAutoCompleteDropdownAdapter<T> extends ArrayAdapter<T> {
 
-    private List<Object> mObjects;
+    private final ObservableArrayList<T> objects;
+    private final LayoutInflater mInflater;
+    private int mDropDownResource;
 
-    public SimpleAutoCompleteDropdownAdapter(@NonNull Context context, int resource) {
-        super(context, resource);
+    public SimpleAutoCompleteDropdownAdapter(@NonNull Context context, int resource, @NonNull List<T> objects) {
+        this(context, resource, new ObservableArrayList<>());
+        this.objects.addAll(objects);
     }
 
-    public SimpleAutoCompleteDropdownAdapter(@NonNull Context context, int resource, int textViewResourceId) {
-        super(context, resource, textViewResourceId);
+    public SimpleAutoCompleteDropdownAdapter(@NonNull Context context, int resource, @NonNull ObservableArrayList<T> objects) {
+        super(context, resource, new ArrayList<>(objects));
+        mInflater = LayoutInflater.from(context);
+        mDropDownResource = resource;
+        this.objects = objects;
+
+        // Listener per aggiornare l'adapter quando la lista cambia
+        this.objects.addOnListChangedCallback(new ObservableList.OnListChangedCallback<ObservableList<T>>() {
+            @Override
+            public void onChanged(ObservableList<T> sender) {
+                updateAdapter();
+            }
+
+            @Override
+            public void onItemRangeChanged(ObservableList<T> sender, int positionStart, int itemCount) {
+                updateAdapter();
+            }
+
+            @Override
+            public void onItemRangeInserted(ObservableList<T> sender, int positionStart, int itemCount) {
+                updateAdapter();
+            }
+
+            @Override
+            public void onItemRangeMoved(ObservableList<T> sender, int fromPosition, int toPosition, int itemCount) {
+                updateAdapter();
+            }
+
+            @Override
+            public void onItemRangeRemoved(ObservableList<T> sender, int positionStart, int itemCount) {
+                updateAdapter();
+            }
+        });
     }
 
-    public SimpleAutoCompleteDropdownAdapter(@NonNull Context context, int resource, @NonNull Object[] objects) {
-        super(context, resource, objects);
-        mObjects = Arrays.asList(objects);
+    private void updateAdapter() {
+        clear();
+        addAll(objects);
+        notifyDataSetChanged();
     }
 
-    public SimpleAutoCompleteDropdownAdapter(@NonNull Context context, int resource, int textViewResourceId, @NonNull Object[] objects) {
-        super(context, resource, textViewResourceId, objects);
-        mObjects = Arrays.asList(objects);
-    }
-
-    public SimpleAutoCompleteDropdownAdapter(@NonNull Context context, int resource, @NonNull List objects) {
-        super(context, resource, objects);
-        mObjects = objects;
-    }
-
-    public SimpleAutoCompleteDropdownAdapter(@NonNull Context context, int resource, int textViewResourceId, @NonNull List objects) {
-        super(context, resource, textViewResourceId, objects);
-        mObjects = objects;
-    }
-
-
     @NonNull
     @Override
     public Filter getFilter() {
-        return new StringFilter(mObjects);
+        return new StringFilter(objects);
     }
 
+    private class StringFilter extends Filter {
 
-
-
-    private class StringFilter<T> extends Filter {
-
-        private ArrayList<T> sourceObjects;
+        private final List<T> sourceObjects;
 
         public StringFilter(List<T> objects) {
-            if(objects == null) return;
-            sourceObjects = new ArrayList<T>();
-            synchronized (this) {
-                sourceObjects.addAll(objects);
-            }
+            this.sourceObjects = objects;
         }
 
         @Override
         protected FilterResults performFiltering(CharSequence chars) {
-            String filterSeq = chars.toString().toLowerCase();
+            String filterSeq = chars == null ? "" : chars.toString().toLowerCase();
             FilterResults result = new FilterResults();
-            if (filterSeq != null && filterSeq.length() > 0) {
-                ArrayList<T> filter = new ArrayList<T>();
 
-                for (T object : sourceObjects) {
-                    // the filtering itself:
-                    if (object.toString().toLowerCase().contains(filterSeq))
-                        filter.add(object);
-                }
-                result.count = filter.size();
-                result.values = filter;
+            if (filterSeq.isEmpty()) {
+                result.values = new ArrayList<>(sourceObjects);
+                result.count = sourceObjects.size();
             } else {
-                // add all objects
-                synchronized (this) {
-                    result.values = sourceObjects;
-                    result.count = sourceObjects.size();
+                ArrayList<T> filtered = new ArrayList<>();
+                for (T object : sourceObjects) {
+                    String stringObject = object.toString();
+
+                    if (stringObject.toLowerCase().contains(filterSeq)) {
+                        filtered.add(object);
+                    }
                 }
+                result.values = filtered;
+                result.count = filtered.size();
             }
             return result;
         }
 
         @SuppressWarnings("unchecked")
         @Override
-        protected void publishResults(CharSequence constraint,
-                                      FilterResults results) {
-            // NOTE: this function is *always* called from the UI thread.
-            if(constraint != null && constraint.length() > 2) {
-                ArrayList<T> filtered = (ArrayList<T>) results.values;
-                notifyDataSetChanged();
-                clear();
-                for (int i = 0, l = filtered.size(); i < l; i++)
-                    add(filtered.get(i));
-                notifyDataSetInvalidated();
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            List<T> filtered = (List<T>) results.values;
+            if (filtered != null) {
+                synchronized (this) {
+                    clear();
+                    addAll(filtered);
+                    notifyDataSetChanged();
+                }
             }
         }
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtComponent.java
new file mode 100644
index 00000000..2cc6abe0
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.create_new_art;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogCreateNewArtComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogCreateNewArtComponent create();
+    }
+
+    void inject(DialogCreateNewArtView dialogCreateNewArtView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtModule.java
new file mode 100644
index 00000000..cdc5dfe6
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtModule.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.view.dialogs.create_new_art;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
+
+@Module(subcomponents = DialogCreateNewArtComponent.class)
+public class DialogCreateNewArtModule {
+
+    @Provides
+    DialogCreateNewArtViewModel providesDialogCreateNewArtViewModel(ArticoloRESTConsumer articoloRESTConsumer) {
+        return new DialogCreateNewArtViewModel(articoloRESTConsumer);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtView.java
new file mode 100644
index 00000000..24e5b708
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtView.java
@@ -0,0 +1,302 @@
+package it.integry.integrywmsnative.view.dialogs.create_new_art;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.text.InputFilter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.ObservableField;
+import androidx.databinding.ObservableList;
+
+import javax.inject.Inject;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
+import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.model.MtbGrup;
+import it.integry.integrywmsnative.core.model.MtbSfam;
+import it.integry.integrywmsnative.core.model.MtbSgrp;
+import it.integry.integrywmsnative.core.model.MtbUntMis;
+import it.integry.integrywmsnative.core.utility.UtilityBarcode;
+import it.integry.integrywmsnative.core.utility.UtilityObservable;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.databinding.DialogCreateNewArtBinding;
+import it.integry.integrywmsnative.ui.adapter.SimpleAutoCompleteDropdownAdapter;
+
+public class DialogCreateNewArtView extends BaseDialogFragment implements DialogCreateNewArtViewModel.Listener {
+
+    public final ObservableField<String> selectedUntMisText = new ObservableField<>();
+    public final ObservableField<String> selectedMtbGrupText = new ObservableField<>();
+    public final ObservableField<String> selectedMtbSubGrupText = new ObservableField<>();
+    public final ObservableField<String> selectedMtbSubSubGrupText = new ObservableField<>();
+    public final ObservableField<String> selectedPosizioneText = new ObservableField<>();
+    public final BindableBoolean editingBarcode = new BindableBoolean(false);
+
+    @Inject
+    DialogCreateNewArtViewModel mViewModel;
+
+    private DialogCreateNewArtBinding mBindings;
+    private Context mContext;
+
+    public final BarcodeScanDTO mScannedBarcode;
+    private int mBarcodeScannerIstanceID;
+
+    private final String initialPosizione;
+    private final RunnableArgs<String> onArticleCreated;
+
+    //Pass here all external parameters
+    public static DialogCreateNewArtView newInstance() {
+        return newInstance(null, null, null);
+    }
+
+    //Pass here all external parameters
+    public static DialogCreateNewArtView newInstance(String description, BarcodeScanDTO barcode, String posizione) {
+        return new DialogCreateNewArtView(description, barcode, posizione, null);
+    }
+
+    public static DialogCreateNewArtView newInstance(String description, BarcodeScanDTO barcode, String posizione, RunnableArgs<String> onArticleCreated) {
+        return new DialogCreateNewArtView(description, barcode, posizione, onArticleCreated);
+    }
+
+    private DialogCreateNewArtView(String description, BarcodeScanDTO barcode, String posizione, RunnableArgs<String> onArticleCreated) {
+        super();
+        this.mScannedBarcode = barcode;
+        this.onArticleCreated = onArticleCreated;
+        this.initialPosizione = posizione;
+
+        MainApplication.appComponent
+                .dialogCreateNewArtComponent()
+                .create()
+                .inject(this);
+
+        mViewModel.setListener(this);
+        if (description != null) mViewModel.descrizione.set(description.toUpperCase());
+    }
+
+    @Override
+    public int getTheme() {
+        return R.style.AppTheme_NewMaterial_Dialog_FullscreenDialog;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogCreateNewArtBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+        mBindings.setViewmodel(mViewModel);
+        mBindings.setView(this);
+        mBindings.toolbar.setTitle("Nuovo articolo");
+
+        this.initBarcodeReader();
+        this.initObservable();
+        this.initBarcodes();
+
+        mBindings.inputDescrizioneText.setFilters(new InputFilter.AllCaps[]{
+                new InputFilter.AllCaps()
+        });
+
+        SimpleAutoCompleteDropdownAdapter<String> arrayAdapterPosizioni = new SimpleAutoCompleteDropdownAdapter<>(mContext,
+                android.R.layout.simple_dropdown_item_1line,
+                UtilityObservable.convertObservableArrayList(mViewModel.retrieveAvailablePosizioni(), MtbDepoPosizione::getPosizione));
+        mBindings.inputDefaultPosText.setAdapter(arrayAdapterPosizioni);
+        mViewModel.retrieveAvailablePosizioni().addOnListChangedCallback(new OnListGeneralChangedCallback<MtbDepoPosizione>() {
+            @Override
+            public void onChanged(ObservableList<MtbDepoPosizione> sender) {
+                if(!UtilityString.isNullOrEmpty(initialPosizione)) {
+                    selectedPosizioneText.set(initialPosizione);
+                } else if(sender.size() == 1) {
+                    selectedPosizioneText.set(sender.get(0).getPosizione());
+                }
+            }
+        });
+
+        SimpleAutoCompleteDropdownAdapter<String> arrayAdapterUntMis = new SimpleAutoCompleteDropdownAdapter<>(mContext,
+                android.R.layout.simple_dropdown_item_1line,
+                UtilityObservable.convertObservableArrayList(mViewModel.retrieveAvailableUntMis(), MtbUntMis::getUntMis));
+        mBindings.filledUntMisText.setAdapter(arrayAdapterUntMis);
+        mViewModel.retrieveAvailableUntMis().addOnListChangedCallback(new OnListGeneralChangedCallback<MtbUntMis>() {
+            @Override
+            public void onChanged(ObservableList<MtbUntMis> sender) {
+                if(sender.size() == 1) {
+                    selectedUntMisText.set(sender.get(0).getUntMis());
+                } else if(sender.stream().anyMatch(x -> x.getUntMis().equalsIgnoreCase("PZ"))) {
+                    MtbUntMis pzUntMis = sender.stream().filter(x -> x.getUntMis().equalsIgnoreCase("PZ")).findFirst().get();
+                    selectedUntMisText.set(pzUntMis.getUntMis());
+                }
+            }
+        });
+
+        SimpleAutoCompleteDropdownAdapter<String> arrayAdapterGruppoArt = new SimpleAutoCompleteDropdownAdapter<>(mContext,
+                android.R.layout.simple_dropdown_item_1line,
+                UtilityObservable.convertObservableArrayList(mViewModel.retrieveAvailableArtGroups(), x -> String.format("%s - %s", x.getCodMgrp(), x.getDescrizione())));
+        mBindings.filledGruppoText.setAdapter(arrayAdapterGruppoArt);
+        mViewModel.retrieveAvailableArtGroups().addOnListChangedCallback(new OnListGeneralChangedCallback<MtbGrup>() {
+            @Override
+            public void onChanged(ObservableList<MtbGrup> sender) {
+                if(sender.size() == 1) {
+                    selectedMtbGrupText.set(String.format("%s - %s", sender.get(0).getCodMgrp(), sender.get(0).getDescrizione()));
+                }
+            }
+        });
+
+        SimpleAutoCompleteDropdownAdapter<String> arrayAdapterSottoGruppoArt = new SimpleAutoCompleteDropdownAdapter<>(mContext,
+                android.R.layout.simple_dropdown_item_1line,
+                UtilityObservable.convertObservableArrayList(mViewModel.retrieveAvailableArtSubGroups(), x -> String.format("%s - %s", x.getCodMsgr(), x.getDescrizione())));
+        mBindings.filledSottoGruppoText.setAdapter(arrayAdapterSottoGruppoArt);
+        mViewModel.retrieveAvailableArtSubGroups().addOnListChangedCallback(new OnListGeneralChangedCallback<MtbSgrp>() {
+            @Override
+            public void onChanged(ObservableList<MtbSgrp> sender) {
+                if(sender.size() == 1) {
+                    selectedMtbSubGrupText.set(String.format("%s - %s", sender.get(0).getCodMsgr(), sender.get(0).getDescrizione()));
+                }
+            }
+        });
+
+        SimpleAutoCompleteDropdownAdapter<String> arrayAdapterSottoSottoGruppoArt = new SimpleAutoCompleteDropdownAdapter<>(mContext,
+                android.R.layout.simple_dropdown_item_1line,
+                UtilityObservable.convertObservableArrayList(mViewModel.retrieveAvailableArtSubSubGroups(), x -> String.format("%s - %s", x.getCodMsfa(), x.getDescrizione())));
+        mBindings.filledSottoSottoGruppoText.setAdapter(arrayAdapterSottoSottoGruppoArt);
+        mViewModel.retrieveAvailableArtSubSubGroups().addOnListChangedCallback(new OnListGeneralChangedCallback<MtbSfam>() {
+            @Override
+            public void onChanged(ObservableList<MtbSfam> sender) {
+                if(sender.size() == 1) {
+                    selectedMtbSubSubGrupText.set(String.format("%s - %s", sender.get(0).getCodMsfa(), sender.get(0).getDescrizione()));
+                }
+            }
+        });
+
+        mViewModel.init();
+
+        return mBindings.getRoot();
+    }
+
+    private void initBarcodeReader() {
+        mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessful(data -> {
+                    requireActivity().runOnUiThread(() -> {
+
+                        if (UtilityBarcode.isEtichettaPosizione(data)) {
+                            selectedPosizioneText.set(data.getStringValue());
+                        } else if (editingBarcode.get()) {
+                            mViewModel.barcodeProdotto.set(data.getStringValue());
+                            saveBarcode();
+                        }
+                    });
+                })
+                .setOnScanFailed(this::onError));
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        super.onDismiss(dialog);
+        BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
+    }
+
+    private void initObservable() {
+        this.selectedUntMisText.addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                mViewModel.selectedUntMis.set(mViewModel.retrieveAvailableUntMis().stream()
+                        .filter(x -> x.getUntMis().equals(selectedUntMisText.get()))
+                        .findFirst().orElse(null));
+            }
+        });
+
+
+
+        this.selectedMtbGrupText.addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                mViewModel.selectedMtbGrup.set(mViewModel.retrieveAvailableArtGroups().stream()
+                        .filter(x -> String.format("%s - %s", x.getCodMgrp(), x.getDescrizione()).equals(selectedMtbGrupText.get()))
+                        .findFirst().orElse(null));
+
+                selectedMtbSubGrupText.set(null);
+            }
+        });
+
+
+
+        this.selectedMtbSubGrupText.addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                mViewModel.selectedMtbSubGrup.set(mViewModel.retrieveAvailableArtSubGroups().stream()
+                        .filter(x -> String.format("%s - %s", x.getCodMsgr(), x.getDescrizione()).equals(selectedMtbSubGrupText.get()))
+                        .findFirst().orElse(null));
+
+                selectedMtbSubSubGrupText.set(null);
+            }
+        });
+
+
+        this.selectedMtbSubSubGrupText.addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                mViewModel.selectedMtbSubSubGrup.set(mViewModel.retrieveAvailableArtSubSubGroups().stream()
+                        .filter(x -> String.format("%s - %s", x.getCodMsfa(), x.getDescrizione()).equals(selectedMtbSubSubGrupText.get()))
+                        .findFirst().orElse(null));
+            }
+        });
+
+
+
+
+        this.selectedPosizioneText.addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                mViewModel.selectedPosizioneDefault.set(mViewModel.retrieveAvailablePosizioni().stream()
+                        .filter(x -> x.getPosizione().equals(selectedPosizioneText.get()))
+                        .findFirst().orElse(null));
+            }
+        });
+    }
+
+
+    private void initBarcodes() {
+        if (mScannedBarcode != null) {
+            mViewModel.barcodeProdotto.set(mScannedBarcode.getStringValue());
+            try {
+                generateBarcodeBitmap();
+            } catch (Exception e) {
+                onError(e);
+            }
+        }
+    }
+
+    public void saveBarcode() {
+        try {
+            generateBarcodeBitmap();
+            editingBarcode.toggle();
+        } catch (Exception e) {
+            onError(e);
+        }
+    }
+
+    private void generateBarcodeBitmap() throws Exception {
+        Bitmap barcodeBitmap = UtilityBarcode.generateBarcodeImage(mViewModel.barcodeProdotto.get(), 500, 170);
+        mBindings.barcodeProdottoImage.setImageBitmap(barcodeBitmap);
+    }
+
+    @Override
+    public void onSaved(String codMart) {
+        this.dismiss();
+
+        if (this.onArticleCreated != null) this.onArticleCreated.run(codMart);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtViewModel.java
new file mode 100644
index 00000000..1b0a2ace
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtViewModel.java
@@ -0,0 +1,209 @@
+package it.integry.integrywmsnative.view.dialogs.create_new_art;
+
+import androidx.databinding.ObservableArrayList;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import it.integry.integrywmsnative.core.di.ValidatableObservableField;
+import it.integry.integrywmsnative.core.di.validators.GreaterThenValidator;
+import it.integry.integrywmsnative.core.di.validators.NotEmptyValidator;
+import it.integry.integrywmsnative.core.di.validators.NotNullValidator;
+import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.model.MtbGrup;
+import it.integry.integrywmsnative.core.model.MtbSfam;
+import it.integry.integrywmsnative.core.model.MtbSgrp;
+import it.integry.integrywmsnative.core.model.MtbUntMis;
+import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.articolo.ArticoloDTO;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+
+public class DialogCreateNewArtViewModel {
+
+
+    private Listener mListener;
+
+    private final ArticoloRESTConsumer articoloRESTConsumer;
+
+    private final ObservableArrayList<MtbUntMis> availableUntMis = new ObservableArrayList<>();
+    private final ObservableArrayList<MtbGrup> availableMtbGroups = new ObservableArrayList<>();
+    private final ObservableArrayList<MtbSgrp> availableMtbSubGroups = new ObservableArrayList<>();
+    private final ObservableArrayList<MtbSfam> availableMtbSubSubGroups = new ObservableArrayList<>();
+
+    private final ObservableArrayList<MtbDepoPosizione> availablePosizioni = new ObservableArrayList<>();
+
+    public ValidatableObservableField<String> descrizione = new ValidatableObservableField<>() {{
+        addValidator(new NotEmptyValidator("La descrizione non può essere vuota"));
+    }};
+
+    public final ValidatableObservableField<String> noteAggiuntive = new ValidatableObservableField<>();
+    public final ValidatableObservableField<BigDecimal> qtaCnf = new ValidatableObservableField<>(BigDecimal.ONE) {{
+        addValidator(new NotNullValidator<>("La qta x cnf deve essere > 0"));
+        addValidator(new GreaterThenValidator(BigDecimal.ZERO, "La qta x cnf deve essere > 0"));
+    }};
+
+    public final ValidatableObservableField<String> barcodeProdotto = new ValidatableObservableField<>();
+    public final ValidatableObservableField<Boolean> qtaCnfFissa = new ValidatableObservableField<>(true);
+
+    public ValidatableObservableField<MtbUntMis> selectedUntMis = new ValidatableObservableField<>(null) {{
+        addValidator(new NotNullValidator<>("Seleziona un'unità di misura"));
+    }};
+    public ValidatableObservableField<MtbGrup> selectedMtbGrup = new ValidatableObservableField<>(null) {{
+        addValidator(new NotNullValidator<>("Seleziona un gruppo"));
+    }};
+    public ValidatableObservableField<MtbSgrp> selectedMtbSubGrup = new ValidatableObservableField<>(null) {{
+        addValidator(new NotNullValidator<>("Seleziona un sotto gruppo"));
+    }};
+    public ValidatableObservableField<MtbSfam> selectedMtbSubSubGrup = new ValidatableObservableField<>(null) {{
+        addValidator(new NotNullValidator<>("Seleziona un sotto-sotto gruppo"));
+    }};
+
+    public ValidatableObservableField<MtbDepoPosizione> selectedPosizioneDefault = new ValidatableObservableField<>(null) {{
+        addValidator(new NotNullValidator<>("Seleziona una posizione"));
+    }};
+
+
+    public DialogCreateNewArtViewModel(ArticoloRESTConsumer articoloRESTConsumer) {
+        this.articoloRESTConsumer = articoloRESTConsumer;
+    }
+
+    public void init() {
+        this.sendOnLoadingStarted();
+
+        this.availablePosizioni.addAll(SettingsManager.iDB().getAvailablePosizioni());
+
+        this.articoloRESTConsumer.retrieveAvailableUntMis(untMisList -> {
+            this.availableUntMis.addAll(untMisList);
+
+            this.articoloRESTConsumer.retrieveAvailableGruppiMerceologici(mtbGrupList -> {
+
+                List<String> allowedCodMgrpForArtCreation = SettingsManager.iDB().getAllowedCodMgrpForArtCreation();
+
+                if(allowedCodMgrpForArtCreation != null && !allowedCodMgrpForArtCreation.isEmpty()) {
+                    mtbGrupList = mtbGrupList.stream()
+                            .filter(x -> allowedCodMgrpForArtCreation.contains(x.getCodMgrp()))
+                            .collect(Collectors.toUnmodifiableList());
+                }
+
+                if(mtbGrupList.size() == 1)
+                    this.selectedMtbGrup.set(mtbGrupList.get(0));
+
+                this.availableMtbGroups.addAll(mtbGrupList);
+
+                this.sendOnLoadingEnded();
+            }, this::sendError);
+        }, this::sendError);
+
+        this.selectedMtbGrup.addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                availableMtbSubGroups.clear();
+
+                if (selectedMtbGrup != null && selectedMtbGrup.get() != null)
+                    availableMtbSubGroups.addAll(Objects.requireNonNull(selectedMtbGrup.get()).getMtbSgrp());
+            }
+        });
+
+        this.selectedMtbSubGrup.addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                availableMtbSubSubGroups.clear();
+
+                if (selectedMtbSubGrup != null && selectedMtbSubGrup.get() != null)
+                    availableMtbSubSubGroups.addAll(Objects.requireNonNull(selectedMtbSubGrup.get()).getMtbSfam());
+            }
+        });
+
+    }
+
+    public ObservableArrayList<MtbDepoPosizione> retrieveAvailablePosizioni() {
+        return availablePosizioni;
+    }
+
+    public ObservableArrayList<MtbUntMis> retrieveAvailableUntMis() {
+        return availableUntMis;
+    }
+
+    public ObservableArrayList<MtbGrup> retrieveAvailableArtGroups() {
+        return availableMtbGroups;
+    }
+
+    public ObservableArrayList<MtbSgrp> retrieveAvailableArtSubGroups() {
+        return availableMtbSubGroups;
+    }
+
+    public ObservableArrayList<MtbSfam> retrieveAvailableArtSubSubGroups() {
+        return availableMtbSubSubGroups;
+    }
+
+
+    public void save() {
+        if (descrizione.validate() &
+                noteAggiuntive.validate() &
+                selectedMtbGrup.validate() &
+                selectedMtbSubGrup.validate() &
+                selectedMtbSubSubGrup.validate() &
+                selectedUntMis.validate() &
+                qtaCnf.validate() &
+                qtaCnfFissa.validate() &
+                selectedPosizioneDefault.validate() &
+                barcodeProdotto.validate()
+        ) {
+            ArticoloDTO articoloToSave = new ArticoloDTO()
+                    .setDescrizione(descrizione.get())
+                    .setDescrizioneEstesa(descrizione.get())
+                    .setNote(UtilityString.empty2null(noteAggiuntive.get()))
+                    .setCodMgrp(selectedMtbGrup.get().getCodMgrp())
+                    .setCodMsgr(selectedMtbSubGrup.get().getCodMsgr())
+                    .setCodMsfa(selectedMtbSubSubGrup.get().getCodMsfa())
+                    .setUntMis(selectedUntMis.get().getUntMis())
+                    .setFlagQtaCnfFissa(qtaCnfFissa.get().booleanValue())
+                    .setQtaCnf(qtaCnf.get())
+                    .setPosizione(selectedPosizioneDefault.get().getPosizione())
+                    .setBarcode(UtilityString.empty2null(barcodeProdotto.get()))
+                    .setFlagStato(true);
+
+            this.sendOnLoadingStarted();
+            articoloRESTConsumer.saveArticolo(articoloToSave, codMart -> {
+                this.sendOnLoadingEnded();
+                this.sendOnSaved(codMart);
+            }, this::sendError);
+        }
+    }
+
+
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
+    }
+
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
+    }
+
+    private void sendOnSaved(String codMart) {
+        if (this.mListener != null) mListener.onSaved(codMart);
+    }
+
+    public void setListener(Listener listener) {
+        this.mListener = listener;
+    }
+
+
+    interface Listener extends ILoadingListener {
+
+        void onSaved(String codMart);
+
+        void onError(Exception ex);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
index ba92bce0..119cbaf9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
@@ -188,7 +188,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
             this.initProductLotStatusNotification();
         }
 
-        MtbUntMis mtbUntMis = mDialogInputQuantityV2DTO.getMtbAart().getMtbUntMis() != null && mDialogInputQuantityV2DTO.getMtbAart().getMtbUntMis().size() > 0 ? mDialogInputQuantityV2DTO.getMtbAart().getMtbUntMis().get(0) : null;
+        MtbUntMis mtbUntMis = mDialogInputQuantityV2DTO.getMtbAart().getMtbUntMis() != null && !mDialogInputQuantityV2DTO.getMtbAart().getMtbUntMis().isEmpty() ? mDialogInputQuantityV2DTO.getMtbAart().getMtbUntMis().get(0) : null;
         if (!(mtbUntMis != null && mtbUntMis.isFlagDig())) {
             mBindings.inputQtaTotText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
         }
@@ -231,7 +231,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                 this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), com.tfb.fbtoast.R.color.error_color)));
             }
             case NON_IN_SCADENZA -> {
-                this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_check_white_24dp);
+                this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_round_check_24);
                 this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), com.tfb.fbtoast.R.color.success_color)));
             }
         }
@@ -295,6 +295,8 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         int onNumCnfInputChanged = SettingsManager.iDB().getOnNumCnfInputChanged();
         int onQtaTotInputChanged = SettingsManager.iDB().getOnQtaTotInputChanged();
 
+        onNumCnfInputChanged = onNumCnfInputChanged == 0 && mViewModel.getMtbAart().isFlagQtaCnfFissaBoolean() ? 2 : onNumCnfInputChanged;
+
         this.mViewModel.setListener(this);
         this.mViewModel.init(onNumCnfInputChanged, onQtaTotInputChanged);
     }
diff --git a/app/src/main/res/drawable/ic_check_black_24dp.xml b/app/src/main/res/drawable/ic_check_black_24dp.xml
deleted file mode 100644
index 3c728c59..00000000
--- a/app/src/main/res/drawable/ic_check_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_check_white_24dp.xml b/app/src/main/res/drawable/ic_check_white_24dp.xml
deleted file mode 100644
index 6541ee3e..00000000
--- a/app/src/main/res/drawable/ic_check_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_round_check_24.xml b/app/src/main/res/drawable/ic_round_check_24.xml
new file mode 100644
index 00000000..e202540c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_check_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M9,16.17L5.53,12.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l4.18,4.18c0.39,0.39 1.02,0.39 1.41,0L20.29,7.71c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.39 -1.02,-0.39 -1.41,0L9,16.17z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
index d78b5cda..05a513ca 100644
--- a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
+++ b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
@@ -177,7 +177,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_num_cnf_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -200,7 +200,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_qta_cnf_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -224,7 +224,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_qta_tot_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -257,7 +257,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_tara_ped_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -282,7 +282,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_tara_col_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -306,7 +306,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_peso_lordo_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
index 73d8344b..08246c7c 100644
--- a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
@@ -712,7 +712,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_partita_mag_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? 1f : 2f}"
@@ -721,7 +721,7 @@
                             android:visibility="@{viewmodel.canPartitaMagBeChanged() || viewmodel.partitaMag != null ? View.VISIBLE : View.GONE}"
                             tools:layout_weight="1">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_partita_mag_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -735,14 +735,14 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_data_scad_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:enabled="@{view.enabledChangePartitaMag}"
                             android:visibility="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? View.VISIBLE : View.GONE}">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_data_scad_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -768,7 +768,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_num_cnf_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
@@ -777,7 +777,7 @@
                             android:paddingEnd="4dp"
                             tools:layout_weight="1">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_num_cnf_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -791,7 +791,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_qta_cnf_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -800,7 +800,7 @@
                             android:paddingEnd="4dp"
                             android:visibility="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? View.VISIBLE : View.GONE}">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_qta_cnf_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -814,7 +814,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_qta_tot_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
@@ -823,7 +823,7 @@
                             android:imeOptions="actionDone"
                             tools:layout_weight="1">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_qta_tot_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -848,7 +848,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_tara_ped_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -857,7 +857,7 @@
                             android:paddingEnd="4dp"
                             tools:layout_weight="1">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_tara_ped_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -872,7 +872,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_tara_col_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -880,7 +880,7 @@
                             android:focusableInTouchMode="false"
                             android:paddingEnd="4dp">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_tara_col_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -896,7 +896,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_peso_lordo_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -905,7 +905,7 @@
                             android:imeOptions="actionDone"
                             tools:layout_weight="1">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_peso_lordo_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -929,13 +929,13 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_note_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:enabled="@{view.enabledNotes}"
                             android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_note_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -959,7 +959,7 @@
 
                         <Button
                             android:id="@+id/close_lu_btn"
-                            style="@style/Button.PrimaryOutline"
+                            style="@style/Widget.Material3.Button.TonalButton"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="0dp"
@@ -975,7 +975,7 @@
 
                         <Button
                             android:id="@+id/abort_btn"
-                            style="@style/Button.DangerFull"
+                            style="@style/Widget.Material3.Button.OutlinedButton"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="4dp"
@@ -983,14 +983,14 @@
                             android:layout_weight="1"
                             android:onClick="@{() -> view.dismiss()}"
                             android:paddingEnd="3dp"
-                            app:icon="@drawable/ic_close_24dp"
-                            app:iconGravity="textStart"
+                            android:textColor="@color/red_400"
+                            app:strokeColor="@color/red_400"
                             app:layout_constraintTop_toTopOf="parent" />
 
 
                         <Button
                             android:id="@+id/save_btn"
-                            style="@style/Button.PrimaryFull"
+                            style="@style/Widget.Material3.Button"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout-large/activity_login.xml b/app/src/main/res/layout-large/activity_login.xml
index c966cf58..8f42594c 100644
--- a/app/src/main/res/layout-large/activity_login.xml
+++ b/app/src/main/res/layout-large/activity_login.xml
@@ -46,13 +46,12 @@
 
                     <!-- Username Label -->
                     <com.google.android.material.textfield.TextInputLayout
-                        style="@style/TextInputLayout.OutlinePrimary"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:layout_marginBottom="8dp"
-                        app:errorText="@{view.usernameError}"
-                        app:hintTextAppearance="@style/hint_text">
+                        app:errorText="@{view.usernameError}">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/input_username"
@@ -66,13 +65,12 @@
 
                     <!-- Password Label -->
                     <com.google.android.material.textfield.TextInputLayout
-                        style="@style/TextInputLayout.OutlinePrimary"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:layout_marginBottom="8dp"
                         app:errorText="@{view.passwordError}"
-                        app:hintTextAppearance="@style/hint_text"
                         app:passwordToggleEnabled="true">
 
                         <com.google.android.material.textfield.TextInputEditText
@@ -102,19 +100,18 @@
                         app:el_duration="400"
                         app:el_expanded_bind="@{view.customSettingsCheckboxChecked}">
 
-                        <LinearLayout
+                        <androidx.appcompat.widget.LinearLayoutCompat
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="vertical">
 
                             <!--Host Label-->
                             <com.google.android.material.textfield.TextInputLayout
-                                style="@style/TextInputLayout.OutlinePrimary"
+                                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="8dp"
-                                app:errorText="@{view.codAziendaError}"
-                                app:hintTextAppearance="@style/hint_text">
+                                app:errorText="@{view.codAziendaError}">
 
                                 <com.google.android.material.textfield.TextInputEditText
                                     android:id="@+id/input_cod_azienda"
@@ -125,7 +122,7 @@
                                     app:binding="@{view.codAzienda}" />
                             </com.google.android.material.textfield.TextInputLayout>
 
-                        </LinearLayout>
+                        </androidx.appcompat.widget.LinearLayoutCompat>
 
                     </net.cachapa.expandablelayout.ExpandableLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 79750872..0fa99ae3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -10,124 +10,121 @@
     </data>
 
 
-            <ScrollView
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:fitsSystemWindows="true">
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:fitsSystemWindows="true">
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="24dp"
+            android:paddingTop="56dp"
+            android:paddingRight="24dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="72dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="24dp"
+                android:src="@drawable/logo_integry_testo" />
+
+            <!-- Username Label -->
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:errorText="@{view.usernameError}">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/input_username"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Username"
+                    android:inputType="textEmailAddress"
+                    app:binding="@{view.username}" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <!-- Password Label -->
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:errorText="@{view.passwordError}"
+                app:passwordToggleEnabled="true">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/input_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Password"
+                    android:inputType="textPassword"
+                    app:binding="@{view.password}" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <androidx.appcompat.widget.AppCompatCheckBox
+                android:id="@+id/login_checkbox_custom_server"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:enabled="@{view.customSettingsCheckboxEnabled}"
+                android:text="@string/action_customize_server_settings"
+                app:checked="@{view.customSettingsCheckboxChecked}" />
+
+            <net.cachapa.expandablelayout.ExpandableLayout
+                android:id="@+id/login_layout_server_details"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="6dp"
+                android:paddingBottom="12dp"
+                app:el_duration="400"
+                app:el_expanded_bind="@{view.customSettingsCheckboxChecked}">
 
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingLeft="24dp"
-                    android:paddingTop="56dp"
-                    android:paddingRight="24dp">
+                    android:orientation="vertical">
 
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="72dp"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginBottom="24dp"
-                        android:src="@drawable/logo_integry_testo" />
-
-                    <!-- Username Label -->
+                    <!--Host Label-->
                     <com.google.android.material.textfield.TextInputLayout
-                        style="@style/TextInputLayout.OutlinePrimary"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
-                        android:layout_marginBottom="8dp"
-                        app:errorText="@{view.usernameError}"
-                        app:hintTextAppearance="@style/hint_text">
+                        app:errorText="@{view.codAziendaError}">
 
                         <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/input_username"
+                            android:id="@+id/input_cod_azienda"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:hint="Username"
-                            android:inputType="textEmailAddress"
-                            app:binding="@{view.username}" />
+                            android:hint="Codice azienda"
+                            android:inputType="text"
+                            app:binding="@{view.codAzienda}" />
                     </com.google.android.material.textfield.TextInputLayout>
 
-                    <!-- Password Label -->
-                    <com.google.android.material.textfield.TextInputLayout
-                        style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginBottom="8dp"
-                        app:errorText="@{view.passwordError}"
-                        app:hintTextAppearance="@style/hint_text"
-                        app:passwordToggleEnabled="true">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/input_password"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="Password"
-                            android:inputType="textPassword"
-                            app:binding="@{view.password}" />
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <androidx.appcompat.widget.AppCompatCheckBox
-                        android:id="@+id/login_checkbox_custom_server"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:enabled="@{view.customSettingsCheckboxEnabled}"
-                        android:text="@string/action_customize_server_settings"
-                        app:checked="@{view.customSettingsCheckboxChecked}" />
-
-                    <net.cachapa.expandablelayout.ExpandableLayout
-                        android:id="@+id/login_layout_server_details"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="6dp"
-                        android:paddingBottom="12dp"
-                        app:el_duration="400"
-                        app:el_expanded_bind="@{view.customSettingsCheckboxChecked}">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical">
-
-                            <!--Host Label-->
-                            <com.google.android.material.textfield.TextInputLayout
-                                style="@style/TextInputLayout.OutlinePrimary"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="8dp"
-                                app:errorText="@{view.codAziendaError}"
-                                app:hintTextAppearance="@style/hint_text">
-
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/input_cod_azienda"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:hint="Codice azienda"
-                                    android:inputType="text"
-                                    app:binding="@{view.codAzienda}" />
-                            </com.google.android.material.textfield.TextInputLayout>
-
-                        </LinearLayout>
-
-                    </net.cachapa.expandablelayout.ExpandableLayout>
-
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/btn_login"
-                        style="@style/Widget.Material3.Button.UnelevatedButton"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="24dp"
-                        android:layout_marginBottom="24dp"
-                        android:enabled="@{view.loginButtonEnabled}"
-                        android:text="@string/login"
-                        app:onClick="@{() -> view.login()}" />
-
-
                 </androidx.appcompat.widget.LinearLayoutCompat>
-            </ScrollView>
+
+            </net.cachapa.expandablelayout.ExpandableLayout>
+
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btn_login"
+                style="@style/Widget.Material3.Button.UnelevatedButton"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:layout_marginBottom="24dp"
+                android:enabled="@{view.loginButtonEnabled}"
+                android:text="@string/login"
+                app:onClick="@{() -> view.login()}" />
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+    </ScrollView>
 
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
index 25db50e4..ba60b704 100644
--- a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
+++ b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
@@ -209,7 +209,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:menu_icon="@drawable/ic_check_white_24dp"
+                app:menu_icon="@drawable/ic_round_check_24"
                 fab:menu_animationDelayPerItem="50"
                 fab:menu_backgroundColor="@color/white_bg_alpha"
                 fab:menu_buttonSpacing="0dp"
@@ -255,7 +255,7 @@
                     android:id="@+id/pv_ordine_close"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_check_black_24dp"
+                    android:src="@drawable/ic_round_check_24"
                     android:visibility="visible"
                     app:fab_colorNormal="@color/white"
                     app:fab_colorPressed="@color/white_pressed"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index ea9e8c9b..02f04f8a 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -95,7 +95,7 @@
                         android:adjustViewBounds="true"
                         android:visibility="gone"
                         android:layout_toStartOf="@id/main_filter"
-                        android:src="@drawable/ic_check_black_24dp"
+                        android:src="@drawable/ic_round_check_24"
                         android:tint="@android:color/black"/>
 
             </androidx.appcompat.widget.Toolbar>
diff --git a/app/src/main/res/layout/dialog_ask_info_inventario.xml b/app/src/main/res/layout/dialog_ask_info_inventario.xml
index cee7a82c..cc6ca0b9 100644
--- a/app/src/main/res/layout/dialog_ask_info_inventario.xml
+++ b/app/src/main/res/layout/dialog_ask_info_inventario.xml
@@ -42,7 +42,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/input_inventory_id"
-                style="@style/TextInputLayout.OutlinePrimary"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/inventory_id"
@@ -61,7 +61,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/input_zone"
-                style="@style/TextInputLayout.OutlinePrimary"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/zone"
diff --git a/app/src/main/res/layout/dialog_ask_position_of_lu__page2.xml b/app/src/main/res/layout/dialog_ask_position_of_lu__page2.xml
index f92a05ae..8c69bd73 100644
--- a/app/src/main/res/layout/dialog_ask_position_of_lu__page2.xml
+++ b/app/src/main/res/layout/dialog_ask_position_of_lu__page2.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
-        style="@style/TextInputLayout.OutlinePrimary">
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/level_number"
diff --git a/app/src/main/res/layout/dialog_ask_should_print.xml b/app/src/main/res/layout/dialog_ask_should_print.xml
index 2bdd284f..db971b3e 100644
--- a/app/src/main/res/layout/dialog_ask_should_print.xml
+++ b/app/src/main/res/layout/dialog_ask_should_print.xml
@@ -132,7 +132,7 @@
     <!--android:layout_width="wrap_content"-->
     <!--android:layout_height="wrap_content"-->
     <!--android:layout_margin="16dp"-->
-    <!--style="@style/TextInputLayout.OutlinePrimary"-->
+    <!--style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"-->
     <!--android:textColor="#5F6368"-->
     <!--android:textSize="16sp"-->
     <!--android:layout_gravity="center"-->
diff --git a/app/src/main/res/layout/dialog_create_new_art.xml b/app/src/main/res/layout/dialog_create_new_art.xml
new file mode 100644
index 00000000..4133b5e7
--- /dev/null
+++ b/app/src/main/res/layout/dialog_create_new_art.xml
@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="viewmodel"
+            type="it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtViewModel" />
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtView" />
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/white"
+        android:fitsSystemWindows="true">
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/colorPrimary"
+                android:minHeight="?attr/actionBarSize"
+                app:titleTextColor="@android:color/white">
+
+            </androidx.appcompat.widget.Toolbar>
+
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="12dp">
+
+                    <TextView
+                        style="?android:attr/textAppearanceSmall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="4dp"
+                        android:text="Informazioni generali"
+                        android:textStyle="bold" />
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_descrizione_layout"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:error="@{viewmodel.descrizione.errorMessage}"
+                        app:errorEnabled="true">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_descrizione_text"
+                            style="@style/TextInputEditText.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/description"
+                            android:inputType="textMultiLine"
+                            android:lines="3"
+                            android:nextFocusDown="@id/input_note_text"
+                            app:binding="@{viewmodel.descrizione}" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_note_layout"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        app:error="@{viewmodel.noteAggiuntive.errorMessage}"
+                        app:errorEnabled="true">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_note_text"
+                            style="@style/TextInputEditText.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/hint_additional_notes"
+                            android:inputType="textMultiLine"
+                            android:lines="2"
+                            android:nextFocusDown="@id/filled_unt_mis_text"
+                            app:binding="@{viewmodel.noteAggiuntive}" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+
+                    <TextView
+                        style="?android:attr/textAppearanceSmall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginBottom="4dp"
+                        android:text="Classificazione merceologica"
+                        android:textStyle="bold" />
+
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_gruppo_layout"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/group"
+                        android:imeOptions="actionNext"
+                        app:error="@{viewmodel.selectedMtbGrup.errorMessage}"
+                        app:errorEnabled="true">
+
+                        <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                            android:id="@+id/filled_gruppo_text"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:clickable="false"
+                            android:ellipsize="end"
+                            android:focusable="false"
+                            android:imeOptions="actionNext"
+                            android:inputType="none"
+                            android:nextFocusDown="@id/filled_sotto_gruppo_text"
+                            android:singleLine="true"
+                            app:binding="@{view.selectedMtbGrupText}" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_sotto_gruppo_layout"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/sub_group"
+                        android:imeOptions="actionNext"
+                        app:error="@{viewmodel.selectedMtbSubGrup.errorMessage}"
+                        app:errorEnabled="true">
+
+                        <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                            android:id="@+id/filled_sotto_gruppo_text"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:clickable="false"
+                            android:ellipsize="end"
+                            android:focusable="false"
+                            android:imeOptions="actionNext"
+                            android:inputType="none"
+                            android:nextFocusDown="@id/filled_sotto_sotto_gruppo_text"
+                            android:singleLine="true"
+                            app:binding="@{view.selectedMtbSubGrupText}" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_sotto_sotto_gruppo_layout"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/sub_sub_group"
+                        android:imeOptions="actionNext"
+                        app:error="@{viewmodel.selectedMtbSubSubGrup.errorMessage}"
+                        app:errorEnabled="true">
+
+                        <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                            android:id="@+id/filled_sotto_sotto_gruppo_text"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:clickable="false"
+                            android:ellipsize="end"
+                            android:focusable="false"
+                            android:imeOptions="actionNext"
+                            android:inputType="none"
+                            android:nextFocusDown="@id/input_qta_cnf_text"
+                            android:singleLine="true"
+                            app:binding="@{view.selectedMtbSubSubGrupText}" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="?android:attr/textAppearanceSmall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginBottom="4dp"
+                        android:text="Dati magazzino"
+                        android:textStyle="bold" />
+
+
+                    <androidx.appcompat.widget.AppCompatCheckBox
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Quantità per confezione fissa"
+                        app:checked="@{viewmodel.qtaCnfFissa}"/>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_horizontal"
+                        android:orientation="horizontal"
+                        android:weightSum="10">
+
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/input_unt_mis_layout"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="4"
+                            android:hint="@string/unt_mis"
+                            android:imeOptions="actionNext"
+                            app:error="@{viewmodel.selectedUntMis.errorMessage}"
+                            app:errorEnabled="true">
+
+                            <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                                android:id="@+id/filled_unt_mis_text"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:clickable="false"
+                                android:ellipsize="end"
+                                android:focusable="false"
+                                android:imeOptions="actionNext"
+                                android:inputType="none"
+                                android:nextFocusDown="@id/input_qta_cnf_text"
+                                android:singleLine="true"
+                                app:binding="@{view.selectedUntMisText}" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/input_qta_cnf_layout"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:layout_weight="6"
+                            android:hint="@string/qty_x_pck"
+                            android:imeOptions="actionDone"
+                            app:error="@{viewmodel.qtaCnf.errorMessage}"
+                            app:errorEnabled="true">
+
+                            <androidx.appcompat.widget.AppCompatEditText
+                                android:id="@+id/input_qta_cnf_text"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:imeOptions="actionDone"
+                                android:inputType="numberDecimal"
+                                android:nextFocusDown="@id/input_default_pos_text"
+                                android:singleLine="true"
+                                app:binding="@{viewmodel.qtaCnf}" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_default_pos_layout"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:hint="@string/position_text"
+                        android:imeOptions="actionNext"
+                        app:error="@{viewmodel.selectedPosizioneDefault.errorMessage}"
+                        app:errorEnabled="true">
+
+                        <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                            android:id="@+id/input_default_pos_text"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:clickable="false"
+                            android:ellipsize="end"
+                            android:focusable="false"
+                            android:imeOptions="actionNext"
+                            android:inputType="none"
+                            android:nextFocusDown="@id/filled_gruppo_text"
+                            android:singleLine="true"
+                            app:binding="@{view.selectedPosizioneText}" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="?android:attr/textAppearanceSmall"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="12dp"
+                            android:layout_marginBottom="4dp"
+                            android:text="Barcode prodotto" />
+
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:id="@+id/barcode_prodotto_image"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:gravity="center_horizontal"
+                            android:orientation="horizontal"
+                            android:weightSum="10">
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="2dp"
+                                android:fontFamily="monospace"
+                                app:binding="@{viewmodel.barcodeProdotto}"
+                                android:textSize="18sp"
+                                app:reverse_visibility="@{view.editingBarcode}"
+                                tools:visibility="gone"
+                                tools:text="809462372" />
+
+
+                            <com.google.android.material.textfield.TextInputLayout
+                                android:id="@+id/input_barcode_layout"
+                                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="5"
+                                android:hint="Barcode"
+                                android:imeOptions="actionNext"
+                                tools:visibility="gone"
+                                app:errorEnabled="true"
+                                app:visibility="@{view.editingBarcode}">
+
+                                <androidx.appcompat.widget.AppCompatEditText
+                                    android:id="@+id/input_barcode_text"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:ellipsize="end"
+                                    android:imeOptions="actionNext"
+                                    android:inputType="text"
+                                    android:singleLine="true"
+                                    app:binding="@{viewmodel.barcodeProdotto}" />
+
+                            </com.google.android.material.textfield.TextInputLayout>
+
+
+                            <androidx.appcompat.widget.AppCompatImageButton
+                                style="@style/Widget.Material3.Button"
+                                android:layout_width="24dp"
+                                android:layout_height="24dp"
+                                android:src="@drawable/ic_edit_24dp"
+                                android:tint="?attr/colorTertiary"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginStart="8dp"
+                                android:onClick="@{() -> view.editingBarcode.toggle()}"
+                                app:reverse_visibility="@{view.editingBarcode}"/>
+
+
+                            <androidx.appcompat.widget.AppCompatImageButton
+                                style="@style/Widget.Material3.Button"
+                                android:layout_width="24dp"
+                                android:layout_height="24dp"
+                                android:src="@drawable/ic_round_check_24"
+                                android:tint="?attr/colorPrimary"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginStart="8dp"
+                                android:onClick="@{() -> view.saveBarcode()}"
+                                app:visibility="@{view.editingBarcode}"/>
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal">
+
+                        <com.google.android.material.button.MaterialButton
+                            style="?attr/borderlessButtonStyle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentStart="true"
+                            android:layout_gravity="start"
+                            android:text="@string/abort"
+                            android:onClick="@{() -> view.dismissAllowingStateLoss()}"/>
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/save_button"
+                            style="?attr/borderlessButtonStyle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_gravity="end"
+                            android:text="@string/action_save"
+                            android:onClick="@{() -> viewmodel.save()}"/>
+
+
+                    </RelativeLayout>
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </ScrollView>
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml b/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml
index 2b7a4ffe..9ff6a54d 100644
--- a/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml
+++ b/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml
@@ -72,7 +72,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/level_number_layout"
-                style="@style/TextInputLayout.OutlinePrimary"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
diff --git a/app/src/main/res/layout/dialog_input_general.xml b/app/src/main/res/layout/dialog_input_general.xml
index 1c5d054f..721705aa 100644
--- a/app/src/main/res/layout/dialog_input_general.xml
+++ b/app/src/main/res/layout/dialog_input_general.xml
@@ -52,7 +52,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/level_number_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="16dp"
diff --git a/app/src/main/res/layout/dialog_input_lu_prod.xml b/app/src/main/res/layout/dialog_input_lu_prod.xml
index 0899b973..1ebcc4b3 100644
--- a/app/src/main/res/layout/dialog_input_lu_prod.xml
+++ b/app/src/main/res/layout/dialog_input_lu_prod.xml
@@ -162,7 +162,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_num_cnf_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:enabled="@{view.enabledNumCnf}"
@@ -185,7 +185,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_qta_cnf_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -209,7 +209,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_qta_tot_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -242,7 +242,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_tara_ped_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -267,7 +267,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_tara_col_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -291,7 +291,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_peso_lordo_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
diff --git a/app/src/main/res/layout/dialog_input_peso_lu.xml b/app/src/main/res/layout/dialog_input_peso_lu.xml
index e126c856..69f05dce 100644
--- a/app/src/main/res/layout/dialog_input_peso_lu.xml
+++ b/app/src/main/res/layout/dialog_input_peso_lu.xml
@@ -110,7 +110,7 @@
                         app:layout_constraintGuide_percent="0.51" />
 
                     <com.google.android.material.textfield.TextInputLayout
-                        style="@style/TextInputLayout.OutlinePrimary"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="16dp"
@@ -129,7 +129,7 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.textfield.TextInputLayout
-                        style="@style/TextInputLayout.OutlinePrimary"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="16dp"
diff --git a/app/src/main/res/layout/dialog_input_quantity_to_return.xml b/app/src/main/res/layout/dialog_input_quantity_to_return.xml
index f9d64cf6..9ba6dfe4 100644
--- a/app/src/main/res/layout/dialog_input_quantity_to_return.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_to_return.xml
@@ -110,7 +110,7 @@
                         app:layout_constraintStart_toStartOf="@id/guide_left"
                         app:layout_constraintEnd_toStartOf="@id/guide_right"
                         android:layout_marginBottom="16dp"
-                        style="@style/TextInputLayout.OutlinePrimary">
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/additional_notes_text"
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 4796b5a4..2acde1ca 100644
--- a/app/src/main/res/layout/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml
@@ -32,7 +32,7 @@
         android:layout_height="match_parent"
         android:fitsSystemWindows="true">
 
-        <LinearLayout
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/full_white"
@@ -723,7 +723,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_partita_mag_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? 1f : 2f}"
@@ -732,7 +732,7 @@
                             android:visibility="@{viewmodel.canPartitaMagBeChanged() || viewmodel.partitaMag != null ? View.VISIBLE : View.GONE}"
                             tools:layout_weight="1">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_partita_mag_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -746,14 +746,14 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_data_scad_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:enabled="@{view.enabledChangePartitaMag}"
                             android:visibility="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? View.VISIBLE : View.GONE}">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_data_scad_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -779,7 +779,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_num_cnf_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
@@ -788,7 +788,7 @@
                             android:paddingEnd="4dp"
                             tools:layout_weight="1">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_num_cnf_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -804,7 +804,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_qta_cnf_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -813,7 +813,7 @@
                             android:paddingEnd="4dp"
                             android:visibility="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? View.VISIBLE : View.GONE}">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_qta_cnf_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -829,7 +829,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_qta_tot_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
@@ -837,7 +837,7 @@
                             android:focusableInTouchMode="false"
                             tools:layout_weight="1">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_qta_tot_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -864,7 +864,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_tara_ped_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -873,7 +873,7 @@
                             android:paddingEnd="4dp"
                             tools:layout_weight="1">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_tara_ped_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -888,7 +888,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_tara_col_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -896,7 +896,7 @@
                             android:focusableInTouchMode="false"
                             android:paddingEnd="4dp">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_tara_col_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -912,7 +912,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_peso_lordo_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -922,7 +922,7 @@
                             tools:enabled="false"
                             tools:layout_weight="1">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_peso_lordo_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -945,13 +945,13 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/input_note_layout"
-                            style="@style/TextInputLayout.OutlinePrimary"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:enabled="@{view.enabledNotes}"
                             android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }">
 
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/input_note_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -971,16 +971,15 @@
                         android:layout_marginTop="16dp"
                         android:gravity="center_horizontal"
                         android:orientation="horizontal"
-                        android:weightSum="3">
+                        android:weightSum="11">
 
                         <Button
-                            style="@style/Widget.Material3.Button.OutlinedButton"
+                            style="@style/Widget.Material3.Button.TonalButton"
                             android:id="@+id/close_lu_btn"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="0dp"
                             android:layout_marginEnd="4dp"
-                            android:layout_weight="1"
+                            android:layout_weight="4"
                             android:onClick="@{() -> view.saveAndCloseLU()}"
                             android:text="@string/action_close_ul"
                             app:strokeColor="?colorPrimary"
@@ -989,33 +988,32 @@
 
                         <Button
                             android:id="@+id/abort_btn"
-                            style="@style/Button.DangerOutline"
+                            style="@style/Widget.Material3.Button.OutlinedButton"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="4dp"
                             android:layout_marginEnd="4dp"
-                            android:layout_weight="1"
+                            android:layout_weight="4"
                             android:onClick="@{() -> view.dismiss()}"
                             android:text="@string/abort"
-                            app:iconGravity="start" />
+                            android:textColor="@color/red_400"
+                            app:strokeColor="@color/red_400"/>
 
 
                         <Button
+                            style="@style/Widget.Material3.Button"
                             android:id="@+id/save_btn"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="4dp"
                             android:layout_marginEnd="0dp"
-                            android:layout_weight="1"
+                            android:layout_weight="3"
                             android:onClick="@{() -> view.save()}"
                             android:text="@string/action_save"
-                            app:icon="@drawable/ic_save_24"
                             app:iconGravity="start" />
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
             </ScrollView>
-        </LinearLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/dialog_pv_edit_articolo.xml b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
index 2b8a8472..41d490d8 100644
--- a/app/src/main/res/layout/dialog_pv_edit_articolo.xml
+++ b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
@@ -627,7 +627,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_num_cnf_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:focusableInTouchMode="false"
@@ -648,7 +648,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_qta_cnf_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -671,7 +671,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_qta_tot_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:focusableInTouchMode="false"
diff --git a/app/src/main/res/layout/fragment_main_accettazione_bolla.xml b/app/src/main/res/layout/fragment_main_accettazione_bolla.xml
index c42ecc15..b6f89c16 100644
--- a/app/src/main/res/layout/fragment_main_accettazione_bolla.xml
+++ b/app/src/main/res/layout/fragment_main_accettazione_bolla.xml
@@ -90,7 +90,7 @@
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
             android:onClick="@{() -> view.dispatchBolle()}"
-            app:srcCompat="@drawable/ic_check_black_24dp"
+            app:srcCompat="@drawable/ic_round_check_24"
             app:visibility="@{view.fabVisible}"
             style="?attr/floatingActionButtonPrimaryStyle" />
     </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_main_accettazione_ordini.xml b/app/src/main/res/layout/fragment_main_accettazione_ordini.xml
index e8b7f3cc..ce6abfe6 100644
--- a/app/src/main/res/layout/fragment_main_accettazione_ordini.xml
+++ b/app/src/main/res/layout/fragment_main_accettazione_ordini.xml
@@ -90,7 +90,7 @@
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
             android:onClick="@{() -> view.dispatchOrders()}"
-            app:srcCompat="@drawable/ic_check_black_24dp"
+            app:srcCompat="@drawable/ic_round_check_24"
             app:visibility="@{view.fabVisible}"
             style="?attr/floatingActionButtonPrimaryStyle" />
     </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita.xml b/app/src/main/res/layout/fragment_main_ordini_uscita.xml
index cd68b974..6177fe22 100644
--- a/app/src/main/res/layout/fragment_main_ordini_uscita.xml
+++ b/app/src/main/res/layout/fragment_main_ordini_uscita.xml
@@ -114,7 +114,7 @@
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
             android:contentDescription="Dispatch orders"
-            app:srcCompat="@drawable/ic_check_black_24dp"
+            app:srcCompat="@drawable/ic_round_check_24"
             android:onClick="@{() -> view.dispatchOrders()}"
             app:visibility="@{view.fabVisible}"
             style="?attr/floatingActionButtonPrimaryStyle" />
diff --git a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
index 9c27e3ea..a500d7ce 100644
--- a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
+++ b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
@@ -5,8 +5,14 @@
 
     <data>
 
+        <import type="it.integry.integrywmsnative.R" />
+
+        <import type="android.text.Html" />
+
         <import type="androidx.databinding.ObservableList" />
 
+        <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
+
         <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
 
         <import type="android.view.View" />
@@ -53,55 +59,45 @@
                             android:layout_height="wrap_content"
                             android:background="@drawable/badge_round_corner"
                             android:backgroundTint="?colorPrimary"
-                            android:orientation="horizontal">
+                            android:orientation="vertical"
+                            android:paddingStart="12dp"
+                            android:paddingTop="8dp"
+                            android:paddingEnd="2dp"
+                            android:paddingBottom="8dp">
 
                             <androidx.appcompat.widget.AppCompatTextView
                                 style="@style/AppTheme.NewMaterial.Text.Medium"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:paddingStart="12dp"
-                                android:paddingTop="8dp"
-                                android:paddingEnd="2dp"
-                                android:paddingBottom="8dp"
-                                android:text="num:"
-                                android:textColor="@android:color/white" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:paddingStart="0dp"
-                                android:paddingTop="8dp"
-                                android:paddingEnd="12dp"
-                                android:paddingBottom="8dp"
-                                android:text="@{view.currentMtbColtObs.numCollo.toString()}"
+                                android:text="@{Html.fromHtml(String.format(context.getString(R.string.lu_number_data_text), view.currentMtbColtObs.numCollo, UtilityDate.formatDate(view.currentMtbColtObs.getDataColloD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)))}"
                                 android:textColor="@android:color/white"
-                                android:textStyle="bold"
-                                tools:text="2156" />
+                                tools:text="UL n° 4894 - 09 dic 2024" />
 
-                            <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
-                                android:layout_width="wrap_content"
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:paddingStart="12dp"
-                                android:paddingTop="8dp"
-                                android:paddingEnd="2dp"
-                                android:paddingBottom="8dp"
-                                android:text="pos:"
-                                android:textColor="@android:color/white"
-                                android:visibility="@{!UtilityString.isNullOrEmpty(viewmodel.currentMtbColt.posizione) ? View.VISIBLE : View.GONE}" />
+                                android:orientation="horizontal">
 
-                            <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@{view.currentMtbColtObs.posizione}"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold"
-                                android:visibility="@{!UtilityString.isNullOrEmpty(viewmodel.currentMtbColt.posizione) ? View.VISIBLE : View.GONE}"
-                                tools:text="ME1FS032" />
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="Posizione: "
+                                    android:textColor="@android:color/white"                                      />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{view.currentMtbColtObs.posizione}"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold"
+
+                                    tools:text="ME1FS032" />
 
 
+                            </androidx.appcompat.widget.LinearLayoutCompat>
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
                     </net.cachapa.expandablelayout.ExpandableLayout>
@@ -111,16 +107,20 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
-                        android:layout_marginTop="4dp"
                         android:layout_marginBottom="4dp"
+                        android:background="@drawable/circular_background_left"
                         android:orientation="horizontal"
-                        android:padding="8dp">
+                        android:paddingHorizontal="8dp"
+                        android:paddingVertical="6dp"
+                        android:paddingTop="0dp">
 
-                        <RadioButton
+                        <androidx.appcompat.widget.AppCompatRadioButton
                             android:id="@+id/rettifica_giacenze_forn_check_box"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="end|center_vertical"
+                            android:minWidth="38dp"
+                            android:minHeight="0dp"
                             android:onClick="@{() -> view.setUIToForn()}" />
 
 
@@ -132,11 +132,10 @@
 
                             <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/auto_complete_fornitori_layout"
-                                style="@style/TextInputLayout.NoLine"
+                                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
-                                android:layout_weight="3"
-                                app:hintTextAppearance="@style/hint_text">
+                                android:layout_weight="3">
 
                                 <androidx.appcompat.widget.AppCompatAutoCompleteTextView
                                     android:id="@+id/auto_complete_fornitori"
@@ -152,12 +151,11 @@
 
                             <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/layout_cod_art_descr_forn"
-                                style="@style/TextInputLayout.NoLine"
+                                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="8dp"
-                                android:layout_weight="7"
-                                app:hintTextAppearance="@style/hint_text">
+                                android:layout_weight="7">
 
                                 <com.google.android.material.textfield.TextInputEditText
                                     android:id="@+id/input_cod_art_descr_forn"
@@ -174,56 +172,50 @@
                         </androidx.appcompat.widget.LinearLayoutCompat>
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
-                    <LinearLayout
+                    <androidx.appcompat.widget.LinearLayoutCompat
                         android:id="@+id/rettifica_giacenze_art_int_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
-                        android:layout_marginTop="4dp"
                         android:layout_marginBottom="4dp"
+                        android:background="@drawable/circular_background_left"
                         android:orientation="horizontal"
-                        android:paddingStart="8dp"
-                        android:paddingTop="6dp"
-                        android:paddingEnd="6dp"
-                        android:paddingBottom="6dp">
+                        android:paddingHorizontal="8dp"
+                        android:paddingVertical="6dp">
 
-                        <RadioButton
+                        <androidx.appcompat.widget.AppCompatRadioButton
                             android:id="@+id/rettifica_giacenze_art_int_check_box"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
+                            android:minWidth="38dp"
+                            android:minHeight="0dp"
                             android:onClick="@{() -> view.setUIToIntArt()}" />
 
-                        <androidx.constraintlayout.widget.ConstraintLayout
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/layout_cod_art_descr_int"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent">
 
-
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:id="@+id/layout_cod_art_descr_int"
-                                style="@style/TextInputLayout.NoLine"
-                                android:layout_width="0dp"
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/input_cod_art_descr_int"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                app:hintTextAppearance="@style/hint_text"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent">
-
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/input_cod_art_descr_int"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:hint="@string/cod_art_or_description"
-                                    android:imeOptions="actionDone"
-                                    android:inputType="textNoSuggestions"
-                                    android:singleLine="true" />
+                                android:hint="@string/cod_art_or_description"
+                                android:imeOptions="actionDone"
+                                android:inputType="textNoSuggestions"
+                                android:singleLine="true" />
 
 
-                            </com.google.android.material.textfield.TextInputLayout>
+                        </com.google.android.material.textfield.TextInputLayout>
 
 
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-                    </LinearLayout>
+                    </androidx.appcompat.widget.LinearLayoutCompat>
 
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
@@ -307,7 +299,7 @@
                         android:layout_margin="@dimen/fab_margin"
                         android:onClick="@{() -> viewmodel.closeLU(true)}"
                         android:tint="@android:color/white"
-                        app:srcCompat="@drawable/ic_check_black_24dp"
+                        app:srcCompat="@drawable/ic_round_check_24"
                         app:visibility="@{view.thereIsAnOpenedUL}" />
 
                 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente.xml b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente.xml
index 68fc4dee..676a30b1 100644
--- a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente.xml
+++ b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente.xml
@@ -102,7 +102,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        app:srcCompat="@drawable/ic_check_black_24dp"
+        app:srcCompat="@drawable/ic_round_check_24"
         style="?attr/floatingActionButtonPrimaryStyle" />
 </FrameLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_picking_libero.xml b/app/src/main/res/layout/fragment_picking_libero.xml
index 578dfbd6..81d60c91 100644
--- a/app/src/main/res/layout/fragment_picking_libero.xml
+++ b/app/src/main/res/layout/fragment_picking_libero.xml
@@ -117,7 +117,7 @@
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
             android:contentDescription=""
-            app:srcCompat="@drawable/ic_check_white_24dp"
+            app:srcCompat="@drawable/ic_round_check_24"
             android:onClick="@{() -> view.closeLU()}"
             app:visibility="@{view.thereIsAnOpenedUL}"
             style="?attr/floatingActionButtonSecondaryStyle" />
diff --git a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml
index f15744da..8d68963d 100644
--- a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml
+++ b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml
@@ -114,7 +114,7 @@
             android:layout_margin="16dp"
             android:contentDescription="Dispatch orders"
             android:onClick="@{() -> view.dispatchOrders()}"
-            app:srcCompat="@drawable/ic_check_black_24dp"
+            app:srcCompat="@drawable/ic_round_check_24"
             app:visibility="@{view.fabVisible}" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_prod_ordine_produzione_elenco.xml b/app/src/main/res/layout/fragment_prod_ordine_produzione_elenco.xml
index f727ec36..ecd8b9fa 100644
--- a/app/src/main/res/layout/fragment_prod_ordine_produzione_elenco.xml
+++ b/app/src/main/res/layout/fragment_prod_ordine_produzione_elenco.xml
@@ -107,7 +107,7 @@
             android:layout_margin="@dimen/fab_margin"
             android:onClick="@{() -> view.dispatchOrders()}"
             android:tint="@android:color/white"
-            app:srcCompat="@drawable/ic_check_black_24dp"
+            app:srcCompat="@drawable/ic_round_check_24"
             app:visibility="@{view.fabVisible}" />
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_prod_versamento_materiale.xml b/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
index b156f7c0..fb1bd7f7 100644
--- a/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
+++ b/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
@@ -215,7 +215,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
-            app:srcCompat="@drawable/ic_check_black_24dp"
+            app:srcCompat="@drawable/ic_round_check_24"
             app:visibility="@{view.fabVisible}"
             app:singleClick="@{view::onConfirmClicked}"
             style="?attr/floatingActionButtonPrimaryStyle" />
diff --git a/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore.xml b/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore.xml
index ac053f79..33ed841c 100644
--- a/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore.xml
+++ b/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore.xml
@@ -104,7 +104,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
-            app:srcCompat="@drawable/ic_check_black_24dp"
+            app:srcCompat="@drawable/ic_round_check_24"
             style="?attr/floatingActionButtonPrimaryStyle" />
     </FrameLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/doc_interni_edit_fab_menu.xml b/app/src/main/res/menu/doc_interni_edit_fab_menu.xml
index fb880ccf..d18bdebb 100644
--- a/app/src/main/res/menu/doc_interni_edit_fab_menu.xml
+++ b/app/src/main/res/menu/doc_interni_edit_fab_menu.xml
@@ -11,7 +11,7 @@
         android:title="@string/delete_document" />
     <item
         android:id="@+id/hold_document"
-        android:icon="@drawable/ic_check_black_24dp"
+        android:icon="@drawable/ic_round_check_24"
         android:title="@string/save_document" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c53e1467..0d69b7d9 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -407,8 +407,10 @@
     <string name="dialog_doc_interni_choose_dtip_mgrp_pair_title">Seleziona estremi documento</string>
     <string name="doc_type">Tipo documento</string>
     <string name="art_group">Gruppo articolo</string>
+    <string name="group">Gruppo</string>
+    <string name="sub_group">Sotto gruppo</string>
+    <string name="sub_sub_group">Sotto sotto gruppo</string>
     <string name="cod_dtip_name">Tipo doc.</string>
-    <string name="cod_mgrp_name">Gruppo art.</string>
     <string name="articoli_disponibili">Articoli disponibili</string>
     <string name="no_doc_found_message">Nessun documento trovato</string>
     <string name="document_label">Documento:</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c654f14d..c8ff0996 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 
 <resources>
     <color name="seed">#4c4dcf</color>
-    <color name="md_theme_light_primary">#4C4DCF</color>
+    <color name="md_theme_light_primary">@color/colorPrimary</color>
     <color name="md_theme_light_onPrimary">#FFFFFF</color>
     <color name="md_theme_light_primaryContainer">#E1DFFF</color>
     <color name="md_theme_light_onPrimaryContainer">#08006C</color>
diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml
index 275d97df..4eab508c 100644
--- a/app/src/main/res/values/config.xml
+++ b/app/src/main/res/values/config.xml
@@ -2,6 +2,8 @@
 <resources>
 
     <item name="bound_observable" type="id" />
+    <item name="bound_reverse_visibility" type="id" />
+
 
 
     <item name="nav_group_acquisto" type="id" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f91c0ec..bcf8bed7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -413,8 +413,10 @@
     <string name="dialog_doc_interni_choose_dtip_mgrp_pair_title">Choose Document details</string>
     <string name="doc_type">Document type</string>
     <string name="art_group">Product group</string>
+    <string name="group">Group</string>
+    <string name="sub_group">Product sub-group</string>
+    <string name="sub_sub_group">Product sub-sub-group</string>
     <string name="cod_dtip_name">Doc type</string>
-    <string name="cod_mgrp_name">Product group</string>
     <string name="articoli_disponibili">Available products</string>
     <string name="no_doc_found_message">No document found</string>
     <string name="document_label">Document:</string>
@@ -425,7 +427,7 @@
     <string name="save_document">Save document</string>
     <string name="fornitore">Supplier</string>
     <string name="cod_anag_name">Supplier</string>
-    <string name="delete_document">Elimina documento</string>
+    <string name="delete_document">Delete document</string>
     <string name="document_rif_label">Ref:</string>
     <string name="gg_scadenza">Shelf life:</string>
     <string name="selling_prediction">Sales prediction</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7590de2b..e0c1d050 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,47 +1,12 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- Base application theme. -->
-<!--    <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">-->
-
-<!--        &lt;!&ndash; Customize your theme here. &ndash;&gt;-->
-<!--        <item name="colorPrimary">@color/colorPrimary</item>-->
-<!--        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
-<!--        <item name="colorAccent">@color/colorAccent</item>-->
-
-<!--        <item name="fontFamily">@font/google_sans_regular</item> &lt;!&ndash; target android sdk versions < 26 and > 14 if theme other than AppCompat &ndash;&gt;-->
-
-<!--        &lt;!&ndash; Add these &ndash;&gt;-->
-<!--        <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>-->
-<!--        <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>-->
-<!--        <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>-->
-
-<!--        <item name="bottomSheetDialogTheme">@style/CustomBottomSheetDialog</item>-->
-
-<!--    </style>-->
-
-
-    <style name="Light" parent="Theme.Material3.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
-        <item name="android:statusBarColor">@android:color/white</item>
-
-        <item name="fontFamily">@font/google_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
-
-        <item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
-        <item name="materialCalendarFullscreenTheme">@style/Widget.Material3.MaterialCalendar.Fullscreen</item>
-        <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
-
-        <item name="bottomSheetDialogTheme">@style/CustomBottomSheetDialog</item>
-    </style>
-
-
     <style name="SplashTheme" parent="AppTheme.NoActionBar">
         <item name="android:windowBackground">@drawable/splash_background</item>
+        <item name="android:statusBarColor">@color/colorPrimary</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
     </style>
 
-    <style name="AppTheme.NoActionBar" parent="@style/Light">
+    <style name="AppTheme.NoActionBar" parent="@style/AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
@@ -115,19 +80,20 @@
     </style>
 
 
-    <style name="AppTheme.NewMaterial.Dialog.FullscreenDialog" parent="Theme.Material3.Light.DialogWhenLarge">
+    <style name="AppTheme.NewMaterial.Dialog.FullscreenDialog" parent="Theme.Material3.DayNight">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
 
         <item name="fontFamily">@font/google_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
 
-        <item name="android:statusBarColor">@android:color/white</item>
         <item name="windowNoTitle">true</item>
-        <item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
         <item name="android:windowIsFloating">false</item>
+        <item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowCloseOnTouchOutside">false</item>
+        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
     </style>
 
 
@@ -188,10 +154,6 @@
         <item name="colorButtonNormal">@android:color/transparent</item>
     </style>
 
-    <style name="hint_text" parent="TextAppearance.Design.Hint">
-        <item name="android:textColor">@color/colorPrimary</item>
-    </style>
-
 
 <!--    <style name="MaterialToolbar.Base" parent="">-->
 <!--        <item name="popupTheme">@style/AppTheme.PopupOverlay</item>-->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5d6c6330..eaa0adc1 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
 
-<resources>
     <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
         <item name="colorPrimary">@color/md_theme_light_primary</item>
         <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
@@ -29,7 +29,13 @@
         <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
 
 
-
         <item name="android:fontFamily">@font/google_sans_regular</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
+        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
+        <item name="materialCalendarFullscreenTheme">@style/Widget.Material3.MaterialCalendar.Fullscreen</item>
+        <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
+
+        <item name="bottomSheetDialogTheme">@style/CustomBottomSheetDialog</item>
     </style>
 </resources>

From cd28d013548ef01d83be192c5cad257fb44b2d9b Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 9 Dec 2024 19:20:51 +0100
Subject: [PATCH 065/103] -> v1.42.00 (460)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 749e9ba6..e9b6d603 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 459
+    def appVersionCode = 460
     def appVersionName = '1.41.11'
 
     signingConfigs {

From cc343c296f0433be6f2714cf573f2a9af10f9163 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 10 Dec 2024 11:02:00 +0100
Subject: [PATCH 066/103] Fix su null quando viene creato un nuovo articolo e
 deve avviare automaticamente la ricerca del nuovo articolo in Rettifica
 Giacenze

---
 .../gest/rettifica_giacenze/RettificaGiacenzeViewModel.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
index c8cbea23..3d5c3c39 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
@@ -200,7 +200,8 @@ public class RettificaGiacenzeViewModel {
     public void searchArtInt(String queryText, BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
         this.sendOnLoadingStarted();
 
-        mRettificaGiacenzeRESTConsumer.searchArtInt(UtilityString.isNull(queryText, barcodeScanDTO.getStringValue()), listaArts -> {
+        String barcode = barcodeScanDTO != null ? barcodeScanDTO.getStringValue() : null;
+        mRettificaGiacenzeRESTConsumer.searchArtInt(UtilityString.isNull(queryText, barcode), listaArts -> {
             this.sendOnLoadingEnded();
 
             dispatchArts(listaArts, null, queryText, barcodeScanDTO);

From b0f2763a85b907b4dcf1f66468b873a1f8696f9f Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 10 Dec 2024 11:02:38 +0100
Subject: [PATCH 067/103] -> v1.42.01 (461)

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

diff --git a/app/build.gradle b/app/build.gradle
index e9b6d603..392b4fef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 460
-    def appVersionName = '1.41.11'
+    def appVersionCode = 461
+    def appVersionName = '1.42.01'
 
     signingConfigs {
         release {

From ac6f64d494ca06b9fb8b0b812174ee974cbfe273 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Thu, 19 Dec 2024 10:09:42 +0100
Subject: [PATCH 068/103] Fix cancellazione e modifica ul in Accettazione bolla

---
 .../AccettazioneBollaPickingActivity.java                       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
index 6ae8b99d..31572319 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
@@ -464,6 +464,8 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
                         .findFirstOrElse(null)
                         .isCanBeRecovered(),
 
+                false,
+
                 ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
 
         this.startActivityForResult(myIntent, PICK_UL_REQUEST);

From d5c0f388db10a49e0742cc0996be63225c4591b5 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 7 Jan 2025 10:23:06 +0100
Subject: [PATCH 069/103] Ripristinato controllo su percentuale hr

---
 .../rest/ProdRecuperMaterialeRESTConsumer.java            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
index 07f2f4de..090704a7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
@@ -67,10 +67,10 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "           dtb_ord_steps.gestione                                    as gestione_ord, " +
                 "           dtb_ord_steps.hr_num                                      as hr, " +
                 "           mtb_colr.riga_ord, " +
-                "           CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) /\n" +
-                "                                                IIF(SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo) = 0, 1,\n" +
-                "                                                    SUM(CASE WHEN dtb_ord_steps.hr_num > 0 then dtb_ord_steps.hr_num else 1 end) OVER (PARTITION BY mtb_colr.num_collo))) * 100,\n" +
-                "                                               0))                                AS percentage_hr " +
+                "           CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / " +
+                "                                   SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
+                "                                   SUM(CASE WHEN dtb_ord_steps.hr_num > 0 then dtb_ord_steps.hr_num else 1 end) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
+                "                                  0))                                as percentage_hr " +
                 "    FROM mtb_colr " +
                 "             INNER JOIN mtb_colt ON mtb_colr.num_collo = mtb_colt.num_collo " +
                 "        AND mtb_colr.data_collo = mtb_colt.data_collo " +

From a3a5f65e53cbebda392168b6657de264dfa9bf07 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Wed, 8 Jan 2025 14:48:07 +0100
Subject: [PATCH 070/103] -> v1.42.02 (462)

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

diff --git a/app/build.gradle b/app/build.gradle
index 392b4fef..4d5cdc41 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 461
-    def appVersionName = '1.42.01'
+    def appVersionCode = 462
+    def appVersionName = '1.42.02'
 
     signingConfigs {
         release {

From 7b0f7f16ba0ab806be6a03417a505867c8ce4f59 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 8 Jan 2025 17:40:10 +0100
Subject: [PATCH 071/103] Fix after merge

---
 .idea/appInsightsSettings.xml                   | 16 +++++++++++++++-
 app/build.gradle                                |  2 +-
 .../MainApplicationComponent.java               |  6 ++++++
 .../consumers/ColliMagazzinoRESTConsumer.java   |  2 +-
 .../core/settings/DBSettingsModel.java          |  9 +++++++++
 .../core/utility/UtilityBigDecimal.java         |  4 ++++
 .../AccettazioneOrdiniPickingViewModel.java     | 17 +++++++++++------
 .../rest/ProdRecuperMaterialeRESTConsumer.java  |  2 +-
 build.gradle                                    |  2 +-
 9 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
index e9268407..87a013ee 100644
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AppInsightsSettings">
-    <option name="selectedTabId" value="Android Vitals" />
+    <option name="selectedTabId" value="Firebase Crashlytics" />
     <option name="tabSettings">
       <map>
+        <entry key="Android Vitals">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="it.integry.ordify.dulciar" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="SEVEN_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
         <entry key="Firebase Crashlytics">
           <value>
             <InsightsFilterSettings>
diff --git a/app/build.gradle b/app/build.gradle
index 392b4fef..ee4327b3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -92,7 +92,7 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
index 55497902..1fb8c389 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
@@ -112,6 +112,7 @@ import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetM
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalModule;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteModule;
+import it.integry.integrywmsnative.view.dialogs.ask_commessa.DialogAskCommessaComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaProdComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaProdModule;
 import it.integry.integrywmsnative.view.dialogs.ask_unknown_barcode_notes.DialogAskUnknownBarcodeNotesComponent;
@@ -369,6 +370,11 @@ public interface MainApplicationComponent {
 
     DialogAskVettoreComponent.Factory dialogAskVettoreComponent();
 
+    DialogAskCommessaComponent.Factory dialogAskCommessaComponent();
+
+    DialogCreateNewArtComponent.Factory dialogCreateNewArtComponent();
+
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
index a380a9f1..b38cefec 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
@@ -423,7 +423,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                 .spostaULInPosizione(codMdep,
                         posizioneString,
                         mtbColtToMoveClone)
-                .enqueue(new Callback<ServiceRESTResponse<Object>>() {
+                .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                         analyzeAnswer(response, "changePosizione", mtbColts -> {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index 910b1784..2161fe3f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -180,6 +180,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public boolean isFlagAskCommessaInPickingLiberoLav() {
+        return flagAskCommessaInPickingLiberoLav;
+    }
+
+    public DBSettingsModel setFlagAskCommessaInPickingLiberoLav(boolean flagAskCommessaInPickingLiberoLav) {
+        this.flagAskCommessaInPickingLiberoLav = flagAskCommessaInPickingLiberoLav;
+        return this;
+    }
+
     public boolean isFlagPickLiberoAllowEmptyCliente() {
         return flagPickLiberoAllowEmptyCliente;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBigDecimal.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBigDecimal.java
index c86d3897..92f04f8b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBigDecimal.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBigDecimal.java
@@ -91,4 +91,8 @@ public class UtilityBigDecimal {
         return input == null || equalsTo(input, BigDecimal.ZERO);
     }
 
+    public static BigDecimal isNull(BigDecimal input1, BigDecimal input2) {
+        return input1 == null ? input2 : input1;
+    }
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
index ab14ce33..c90f53bd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
@@ -474,11 +474,11 @@ public class AccettazioneOrdiniPickingViewModel {
                 });
 
         BigDecimal numCnfDaEvadere = pickingObjectDTO.getSitArtOrdDTO().getNumCnfDaEvadere().subtract(numCnfWithdrawRows.getBigDecimalValue());
-        BigDecimal qtaDaEvadere = pickingObjectDTO.getSitArtOrdDTO().getQtaDaEvadere().subtract(qtaColWithdrawRows.getBigDecimalValue());
+        BigDecimal qtaColDaEvadere = pickingObjectDTO.getSitArtOrdDTO().getQtaDaEvadere().subtract(qtaColWithdrawRows.getBigDecimalValue());
         BigDecimal qtaCnfDaEvadere = qtaCnfOrd;
 
         numCnfDaEvadere = UtilityBigDecimal.getGreaterBetween(numCnfDaEvadere, BigDecimal.ZERO);
-        qtaDaEvadere = UtilityBigDecimal.getGreaterBetween(qtaDaEvadere, BigDecimal.ZERO);
+        qtaColDaEvadere = UtilityBigDecimal.getGreaterBetween(qtaColDaEvadere, BigDecimal.ZERO);
 
         BigDecimal numCnfDaPrelevare = null;
         BigDecimal qtaColDaPrelevare = null;
@@ -569,10 +569,15 @@ public class AccettazioneOrdiniPickingViewModel {
         }
 
         if (executeImmediately) {
+
+            BigDecimal numCnf = UtilityBigDecimal.isNull(numCnfDaPrelevare, numCnfDaEvadere);
+            BigDecimal qtaTot = UtilityBigDecimal.isNull(qtaColDaPrelevare, qtaColDaEvadere);
+            BigDecimal qtaCnf = UtilityBigDecimal.isNull(qtaCnfDaPrelevare, qtaCnfDaEvadere);
+
             this.saveNewRow(pickingObjectDTO,
-                    numCnfDaPrelevare,
-                    qtaCnfDaPrelevare,
-                    qtaColDaPrelevare,
+                    numCnf,
+                    qtaCnf,
+                    qtaTot,
                     partitaMag,
                     dataScad,
                     false);
@@ -581,7 +586,7 @@ public class AccettazioneOrdiniPickingViewModel {
                     pickingObjectDTO,
                     pickingObjectDTO.getMtbAart(),
                     initialNumCnf, initialQtaCnf, initialQtaTot,
-                    qtaDaEvadere,
+                    qtaColDaEvadere,
                     numCnfDaEvadere,
                     qtaCnfDaEvadere,
                     qtaColDaPrelevare,
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
index 090704a7..edad0d23 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
@@ -70,7 +70,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "           CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / " +
                 "                                   SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
                 "                                   SUM(CASE WHEN dtb_ord_steps.hr_num > 0 then dtb_ord_steps.hr_num else 1 end) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
-                "                                  0))                                as percentage_hr " +
+                "                                  0)                                as percentage_hr " +
                 "    FROM mtb_colr " +
                 "             INNER JOIN mtb_colt ON mtb_colr.num_collo = mtb_colt.num_collo " +
                 "        AND mtb_colr.data_collo = mtb_colt.data_collo " +
diff --git a/build.gradle b/build.gradle
index f2c2bbf7..7c8c831a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.20'
-        agp_version = '8.7.2'
+        agp_version = '8.7.3'
     }
 
     repositories {

From cb77c2165658e7fb0e4bcfd2a4200856f25c1759 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 13 Jan 2025 15:54:23 +0100
Subject: [PATCH 072/103] Implementato switch deposito in home page

---
 .idea/appInsightsSettings.xml                 | 14 +++
 .idea/deploymentTargetSelector.xml            |  4 +-
 .../MainApplicationComponent.java             |  7 +-
 .../lista_bancali/ListaBancaliActivity.java   |  1 +
 .../gest/main/MainFragment.java               | 20 +++-
 .../DialogSwitchUserDepoComponent.java        | 14 +++
 .../DialogSwitchUserDepoModule.java           | 14 +++
 .../DialogSwitchUserDepoView.java             | 93 +++++++++++++++++++
 .../DialogSwitchUserDepoViewModel.java        |  5 +
 .../drawable/ic_rounded_change_circle_24.xml  |  5 +
 .../res/layout/dialog_switch_user_depo.xml    | 54 +++++++++++
 .../dialog_switch_user_depo__list_item.xml    | 50 ++++++++++
 app/src/main/res/layout/fragment_main.xml     | 31 ++++++-
 app/src/main/res/values-it/strings.xml        |  3 +
 app/src/main/res/values/strings.xml           |  3 +
 15 files changed, 307 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoComponent.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoModule.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoView.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoViewModel.java
 create mode 100644 app/src/main/res/drawable/ic_rounded_change_circle_24.xml
 create mode 100644 app/src/main/res/layout/dialog_switch_user_depo.xml
 create mode 100644 app/src/main/res/layout/dialog_switch_user_depo__list_item.xml

diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
index e9268407..bc0e1560 100644
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -4,6 +4,20 @@
     <option name="selectedTabId" value="Android Vitals" />
     <option name="tabSettings">
       <map>
+        <entry key="Android Vitals">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="it.integry.ordify.dulciar" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="SEVEN_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
         <entry key="Firebase Crashlytics">
           <value>
             <InsightsFilterSettings>
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index f23a4811..1d0d251a 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-09-13T09:26:42.884931500Z">
+        <DropdownSelection timestamp="2025-01-09T09:29:04.931795900Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=R52T60AZ93A" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=21088B8EFD" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
index 214f6815..8f5d1df8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
@@ -144,6 +144,8 @@ import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtComponent;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtModule;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUComponent;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUModule;
+import it.integry.integrywmsnative.view.dialogs.switch_user_depo.DialogSwitchUserDepoComponent;
+import it.integry.integrywmsnative.view.dialogs.switch_user_depo.DialogSwitchUserDepoModule;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiComponent;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiModule;
 
@@ -221,7 +223,8 @@ import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracc
         ArticoliInGiacenzaModule.class,
         DialogTracciamentoImballiModule.class,
         DialogAskVettoreModule.class,
-        DialogCreateNewArtModule.class
+        DialogCreateNewArtModule.class,
+        DialogSwitchUserDepoModule.class
 })
 public interface MainApplicationComponent {
 
@@ -370,6 +373,8 @@ public interface MainApplicationComponent {
 
     DialogCreateNewArtComponent.Factory dialogCreateNewArtComponent();
 
+    DialogSwitchUserDepoComponent.Factory dialogSwitchUserDepoComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java
index 0b3909e3..22835d2e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java
@@ -88,6 +88,7 @@ public class ListaBancaliActivity extends BaseActivity implements ListaBancaliVi
                 .create()
                 .inject(this);
 
+        mViewModel.setListener(this);
 
         mCanRecoverUl = DataCache.retrieveItem(getIntent().getStringExtra(Key.CanRecoverUL));
         mReportName = DataCache.retrieveItem(getIntent().getStringExtra(Key.ReportName));
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
index 2686d2b0..1873e18b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
@@ -41,6 +41,7 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliSpedizioneRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
@@ -51,6 +52,7 @@ import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.databinding.FragmentMainBinding;
 import it.integry.integrywmsnative.databinding.FragmentMainMenuGroupLayoutBinding;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.view.dialogs.switch_user_depo.DialogSwitchUserDepoView;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -153,6 +155,8 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         initSessionData();
 
         initRecuperoCollo();
+
+        mBindings.switchDepoButton.setVisibility(SettingsManager.iDB().getAvailableCodMdep().size() > 1 ? View.VISIBLE : View.GONE);
     }
 
     private void initSessionData() {
@@ -278,8 +282,8 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
     private void initGestMenu() {
         int menuSpanCount = 2;
-        if (UtilityDimension.getDisplayInchs(this.getActivity()) > 8) menuSpanCount = 4;
-        else if (UtilityDimension.getDisplayInchs(this.getActivity()) > 6.5) menuSpanCount = 3;
+        if (UtilityDimension.getDisplayInchs(this.requireActivity()) > 8) menuSpanCount = 4;
+        else if (UtilityDimension.getDisplayInchs(this.requireActivity()) > 6.5) menuSpanCount = 3;
 
         MenuConfiguration baseMenuConfiguration = new MenuConfiguration();
         List<MenuConfiguration.MenuGroup> menuGroups = baseMenuConfiguration.getGroups();
@@ -319,7 +323,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
 
             } catch (Exception exception) {
-                exception.printStackTrace();
+                UtilityExceptions.defaultException(requireActivity(), exception);
             }
         }
 
@@ -421,4 +425,14 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         colorFadeTitleTextColor.setDuration(animationTimeMillis);
         colorFadeTitleTextColor.start();
     }
+
+    public void changeUserDepo() {
+        DialogSwitchUserDepoView.newInstance(SettingsManager.iDB().getAvailableCodMdep(), this::onUserDepoChanged)
+                .show(getParentFragmentManager(), "switch-user-depo");
+    }
+
+    private void onUserDepoChanged(AvailableCodMdepsDTO newDepo) {
+        SettingsManager.i().getUserSession().setDepo(newDepo);
+        initSessionData();
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoComponent.java
new file mode 100644
index 00000000..fb3dedcb
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.switch_user_depo;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogSwitchUserDepoComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogSwitchUserDepoComponent create();
+    }
+
+    void inject(DialogSwitchUserDepoView dialogSwitchUserDepoView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoModule.java
new file mode 100644
index 00000000..7f05d9e5
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.switch_user_depo;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogSwitchUserDepoComponent.class)
+public class DialogSwitchUserDepoModule {
+
+    @Provides
+    DialogSwitchUserDepoViewModel providesDialogSwitchUserDepoViewModel() {
+        return new DialogSwitchUserDepoViewModel();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoView.java
new file mode 100644
index 00000000..1026465e
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoView.java
@@ -0,0 +1,93 @@
+package it.integry.integrywmsnative.view.dialogs.switch_user_depo;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.BR;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.di.binders.recyclerview.BindingRecyclerViewAdapter;
+import it.integry.integrywmsnative.core.di.binders.recyclerview.ItemBinder;
+import it.integry.integrywmsnative.core.di.binders.recyclerview.ItemBinderBase;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
+import it.integry.integrywmsnative.databinding.DialogSwitchUserDepoBinding;
+
+public class DialogSwitchUserDepoView extends BaseDialogFragment {
+
+    @Inject
+    DialogSwitchUserDepoViewModel mViewModel;
+
+    private DialogSwitchUserDepoBinding mBindings;
+    private Context mContext;
+
+    private final List<AvailableCodMdepsDTO> availableCodMdeps;
+    private final RunnableArgs<AvailableCodMdepsDTO> onComplete;
+
+    //Pass here all external parameters
+    public static DialogSwitchUserDepoView newInstance(List<AvailableCodMdepsDTO> availableCodMdeps, RunnableArgs<AvailableCodMdepsDTO> onComplete) {
+        return new DialogSwitchUserDepoView(availableCodMdeps, onComplete);
+    }
+
+    private DialogSwitchUserDepoView(List<AvailableCodMdepsDTO> availableCodMdeps, RunnableArgs<AvailableCodMdepsDTO> onComplete) {
+        super();
+
+        this.availableCodMdeps = availableCodMdeps;
+        this.onComplete = onComplete;
+
+        MainApplication.appComponent
+                .dialogSwitchUserDepoComponent()
+                .create()
+                .inject(this);
+    }
+
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogSwitchUserDepoBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+
+        setCancelable(true);
+
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+
+        return alertDialog;
+    }
+
+    @Override
+    public void onInit(DialogInterface dialogInterface) {
+        super.onInit(dialogInterface);
+
+        ItemBinder<AvailableCodMdepsDTO> itemBinder = new ItemBinderBase<>(BR.item, R.layout.dialog_switch_user_depo__list_item);
+
+        BindingRecyclerViewAdapter<AvailableCodMdepsDTO> adapter = new BindingRecyclerViewAdapter<>(itemBinder, availableCodMdeps);
+        adapter.setClickHandler(data -> {
+            onComplete.run(data);
+            dismiss();
+        });
+
+        mBindings.availableDepoList.setAdapter(adapter);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoViewModel.java
new file mode 100644
index 00000000..97cfeaca
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoViewModel.java
@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.view.dialogs.switch_user_depo;
+
+public class DialogSwitchUserDepoViewModel {
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_rounded_change_circle_24.xml b/app/src/main/res/drawable/ic_rounded_change_circle_24.xml
new file mode 100644
index 00000000..ed34fc5d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_rounded_change_circle_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M483,619Q454,620 427.5,609.5Q401,599 381,579Q361,559 350.5,534Q340,509 340,481Q340,471 341,461.5Q342,452 345,443Q349,431 344.5,419Q340,407 329,402Q317,397 305.5,402Q294,407 290,419Q285,434 282.5,449Q280,464 280,480Q280,520 295.5,556.5Q311,593 339,621Q366,649 402.5,664Q439,679 478,680L461,697Q452,706 452,718Q452,730 461,739Q470,748 482,748Q494,748 503,739L567,675Q579,663 579,647Q579,631 567,619L503,555Q494,546 482,546Q470,546 461,555Q452,564 452,576Q452,588 461,597L483,619ZM476,340Q505,340 532,350.5Q559,361 579,381Q599,401 609.5,426Q620,451 620,479Q620,489 619,498.5Q618,508 615,517Q611,529 615.5,541.5Q620,554 631,559Q643,564 654.5,559Q666,554 670,542Q675,527 677.5,511.5Q680,496 680,480Q680,440 665.5,403.5Q651,367 622,338Q594,310 557.5,295.5Q521,281 482,281L500,263Q508,254 508,242Q508,230 499,221Q490,212 478,212Q466,212 457,221L393,285Q381,297 381,313Q381,329 393,341L457,405Q466,414 478,414Q490,414 499,405Q508,396 508,384Q508,372 499,363L476,340ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/dialog_switch_user_depo.xml b/app/src/main/res/layout/dialog_switch_user_depo.xml
new file mode 100644
index 00000000..93813766
--- /dev/null
+++ b/app/src/main/res/layout/dialog_switch_user_depo.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="0dp">
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="16dp"
+            android:paddingVertical="16dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_error_white_24dp"
+                app:tint="?colorPrimary" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title_text"
+                style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_marginBottom="16dp"
+                android:text="@string/switch_depo_title" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/description_text"
+                style="@style/TextAppearance.Material3.BodyMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:text="@string/switch_depo_description" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/available_depo_list"
+                android:layout_marginTop="8dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+    </androidx.cardview.widget.CardView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_switch_user_depo__list_item.xml b/app/src/main/res/layout/dialog_switch_user_depo__list_item.xml
new file mode 100644
index 00000000..a5734899
--- /dev/null
+++ b/app/src/main/res/layout/dialog_switch_user_depo__list_item.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="item"
+            type="it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO" />
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="8dp"
+        android:gravity="center_vertical"
+        android:focusable="true"
+        android:clickable="true"
+        android:background="?attr/selectableItemBackground">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/code"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:layout_marginEnd="4dp"
+            style="@style/TextAppearance.AppCompat.Medium"
+            android:text="@{item.descrizione}"
+            tools:text="Deposito centrale" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/code"
+            style="@style/TextAppearance.AppCompat.Small"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:textColor="?colorOnPrimaryContainer"
+            android:background="@drawable/bg_checked_layout"
+            android:backgroundTint="?colorPrimaryContainer"
+            android:paddingHorizontal="6dp"
+            android:paddingVertical="2dp"
+            android:text="@{item.codMdep}"
+            tools:text="01" />
+
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 113a1ee6..bc792173 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -79,7 +79,7 @@
                                 android:padding="16dp">
 
 
-                                <androidx.appcompat.widget.LinearLayoutCompat
+                                <RelativeLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:gravity="center_vertical"
@@ -87,9 +87,11 @@
 
 
                                     <androidx.appcompat.widget.AppCompatImageView
+                                        android:id="@+id/user_icon"
                                         android:layout_width="30dp"
                                         android:layout_height="30dp"
                                         android:layout_marginEnd="16dp"
+                                        android:layout_centerVertical="true"
                                         android:adjustViewBounds="true"
                                         android:clickable="true"
                                         android:focusable="true"
@@ -98,9 +100,13 @@
                                         android:tint="@android:color/white" />
 
                                     <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:id="@+id/user_detail_layout"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:orientation="vertical">
+                                        android:orientation="vertical"
+                                        android:layout_marginEnd="16dp"
+                                        android:layout_toEndOf="@id/user_icon"
+                                        android:layout_toStartOf="@id/switch_depo_button">
 
                                         <androidx.appcompat.widget.AppCompatTextView
                                             android:id="@+id/current_user_name"
@@ -108,7 +114,7 @@
                                             android:layout_width="match_parent"
                                             android:layout_height="wrap_content"
                                             android:textColor="@android:color/white"
-                                            tools:text="Android Studio" />
+                                            tools:text="MARIO ROSSI" />
 
                                         <androidx.appcompat.widget.AppCompatTextView
                                             android:id="@+id/current_deposito"
@@ -116,11 +122,26 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:layout_marginTop="2dp"
-                                            tools:text="android.studio@android.com" />
+                                            tools:text="Deposito: 01 - Centrale" />
 
                                     </androidx.appcompat.widget.LinearLayoutCompat>
 
-                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                                    <androidx.appcompat.widget.AppCompatImageView
+                                        android:id="@+id/switch_depo_button"
+                                        android:layout_width="30dp"
+                                        android:layout_height="30dp"
+                                        android:adjustViewBounds="true"
+                                        android:layout_centerVertical="true"
+                                        android:clickable="true"
+                                        android:focusable="true"
+                                        android:layout_alignParentEnd="true"
+                                        android:onClick="@{() -> view.changeUserDepo()}"
+                                        android:src="@drawable/ic_rounded_change_circle_24"
+                                        android:tint="@android:color/white" />
+
+                                </RelativeLayout>
 
 
                                 <net.cachapa.expandablelayout.ExpandableLayout
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0d69b7d9..fc677fbe 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -481,4 +481,7 @@
     <string name="expired_list_session"><![CDATA[La lista di prodotti è stata caricata troppo tempo fa!]]></string>
     <string name="grid_details">Griglie disponibili</string>
     <string name="searchbar_hint">Cerca</string>
+
+    <string name="switch_depo_title">Cambia deposito</string>
+    <string name="switch_depo_description">Cambia il deposito principale su cui stai lavorando tra quelli a te disponibili</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bcf8bed7..696bed5e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -488,4 +488,7 @@
     <string name="expired_list_session"><![CDATA[The product list was loaded too much time ago!]]></string>
     <string name="grid_details">Available grids</string>
     <string name="searchbar_hint">Search</string>
+
+    <string name="switch_depo_title">Change deposit</string>
+    <string name="switch_depo_description">Change the main deposit you are working on among those available to you</string>
 </resources>

From e5244e75a3174b2f52d72272c0da4fafb4d01c6c Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Wed, 15 Jan 2025 12:05:50 +0100
Subject: [PATCH 073/103] Nelle righe dell'inventario aggiunto id dispositivo

---
 .../integrywmsnative/core/mapper/InventarioRowMapper.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioRowMapper.java b/app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioRowMapper.java
index f54b84c9..36768b5f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioRowMapper.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioRowMapper.java
@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.core.mapper;
 
 import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
 import it.integry.integrywmsnative.core.model.MtbInvenr;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 
 public class InventarioRowMapper extends BaseMapper<MtbInvenr, InventarioRowRoomDTO> {
 
@@ -32,6 +33,7 @@ public class InventarioRowMapper extends BaseMapper<MtbInvenr, InventarioRowRoom
         data.setDataOraInv(inputData.getDataOraInv());
         data.setScanCodBarre(inputData.getScanCodBarre());
         data.setZona(inputData.getZona());
+        data.setIdDisp(SettingsManager.i().getUserSession().getDeviceId());
         return data;
     }
 }

From 00fc3a59eba1f252af3242d303b27e82d6d0d2cb Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Wed, 15 Jan 2025 15:28:05 +0100
Subject: [PATCH 074/103] =?UTF-8?q?Aggiunta=20possibilit=C3=A0=20di=20vari?=
 =?UTF-8?q?are=20l'ordinamento=20avanti=20elenco=20accettazione=20bolla?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/settings/DBSettingsModel.java        |  9 +++
 .../core/settings/SettingsManager.java        |  5 ++
 .../MainAccettazioneBollaElencoFragment.java  | 56 +++++++++++--------
 3 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index ba237dd3..1606cc9c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -85,6 +85,7 @@ public class DBSettingsModel {
     private String docInterniRequestNumDoc;
     private boolean flagEnableArtCreation;
     private List<String> allowedCodMgrpForArtCreation;
+    private boolean flagAccettazioneGroupListForn = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -733,4 +734,12 @@ public class DBSettingsModel {
         this.flagPositionChangeRequest = flagPositionChangeRequest;
         return this;
     }
+
+    public boolean isFlagAccettazioneGroupListForn() {
+        return flagAccettazioneGroupListForn;
+    }
+
+    public void setFlagAccettazioneGroupListForn(boolean flagAccettazioneGroupListForn) {
+        this.flagAccettazioneGroupListForn = flagAccettazioneGroupListForn;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index 5b59af13..1a4f4bd9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -243,6 +243,11 @@ public class SettingsManager {
                 .setSection("ACCETTAZIONE")
                 .setKeySection("FLAG_AUTO_OPEN_NEW_UL")
                 .setSetter(dbSettingsModelIstance::setFlagCanAutoOpenNewULAccettazione));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("ACCETTAZIONE")
+                .setKeySection("FLAG_GROUP_LIST_FORN")
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneGroupListForn));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE")
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/MainAccettazioneBollaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/MainAccettazioneBollaElencoFragment.java
index ecb7bda6..187a9895 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/MainAccettazioneBollaElencoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/MainAccettazioneBollaElencoFragment.java
@@ -25,6 +25,7 @@ import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.expansion.BaseFragment;
 import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.FragmentMainAccettazioneBollaBinding;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.SitBollaAccettazioneDTO;
@@ -166,7 +167,7 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
 
         this.mBolleInevaseMutableData.clear();
 
-        if(tmpList != null)
+        if (tmpList != null)
             this.mBolleInevaseMutableData.addAll(convertDataModelToListModel(tmpList));
     }
 
@@ -182,33 +183,44 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
     }
 
 
-
-
-
     private List<MainAccettazioneBolleElencoListModel> convertDataModelToListModel(List<TestataBollaAccettazioneDTO> dataList) {
-        if(dataList == null)
-            return null;
+        boolean group = !SettingsManager.iDB().isFlagAccettazioneGroupListForn();
+        if (dataList == null) return null;
 
-        final Comparator<TestataBollaAccettazioneDTO> comparer = Comparator.comparing(TestataBollaAccettazioneDTO::getListino)
-                .thenComparing(TestataBollaAccettazioneDTO::getRagSoc)
-                .thenComparing(TestataBollaAccettazioneDTO::getNumDoc);
+        Stream<TestataBollaAccettazioneDTO> stream = Stream.of(dataList);
 
-        return Stream.of(dataList)
-                .sorted(comparer)
-                .map(x -> {
-                    MainAccettazioneBolleElencoListModel listModel = new MainAccettazioneBolleElencoListModel();
+        if (group) {
+            final Comparator<TestataBollaAccettazioneDTO> comparer = Comparator.comparing(TestataBollaAccettazioneDTO::getListino)
+                    .thenComparing(TestataBollaAccettazioneDTO::getRagSoc)
+                    .thenComparing(TestataBollaAccettazioneDTO::getNumDoc);
+            stream = stream.sorted(comparer);
+        } else {
+            stream = stream.sortBy(x -> x.getRagSoc() + UtilityDate.formatDate(x.getDataDoc(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH));
+        }
 
-                    listModel.setOriginalModel(x);
-                    listModel.setGroupTitle(x.getListino() + " - " + x.getRagSoc());
-                    listModel.setDescription(String.format(getString(R.string.ord_acq_testata), x.getNumDoc(), UtilityDate.formatDate(x.getDataDoc(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)));
+        return stream.map(x -> {
+            MainAccettazioneBolleElencoListModel listModel = new MainAccettazioneBolleElencoListModel();
+            listModel.setOriginalModel(x);
 
-                    listModel.setSubDescription(x.getDescrizioneListino());
-                    listModel.setRightDescription(x.getCodAnag());
-                    listModel.setRightSubDescription(x.getCodJcom());
+            if (group)
+                listModel.setGroupTitle(x.getListino() + " - " + x.getRagSoc());
+            else
+                listModel.setGroupTitle(x.getRagSoc());
 
-                    return listModel;
-                })
-                .toList();
+            listModel.setDescription(String.format(getString(R.string.ord_acq_testata),
+                    x.getNumDoc(),
+                    UtilityDate.formatDate(x.getDataDoc(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)));
+
+            if (group)
+                listModel.setSubDescription(x.getDescrizioneListino());
+            else
+                listModel.setSubDescription(x.getListino() + " - " + x.getDescrizioneListino());
+
+            listModel.setRightDescription(x.getCodAnag());
+            listModel.setRightSubDescription(x.getCodJcom());
+
+            return listModel;
+        }).toList();
     }
 
 

From 019688a5cccea99b39b61bb3b07c5e9483e953bf Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Wed, 15 Jan 2025 16:02:01 +0100
Subject: [PATCH 075/103] In accettazione da bolla l'ultima referenza
 scansionata deve comparire all'inizio dell'elenco

---
 .../AccettazioneBollaPickingListAdapter.java  | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
index bf8f8a83..3b81d9c4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
@@ -2,10 +2,12 @@ package it.integry.integrywmsnative.gest.accettazione_bolla_picking.ui;
 
 import android.content.Context;
 import android.graphics.Color;
+import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.ObservableArrayList;
@@ -15,7 +17,11 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
@@ -62,10 +68,29 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
         this.mShowSecondaryUntMis = showSecondaryUntMis;
 
         mutableDataSet.addOnListChangedCallback(new OnListGeneralChangedCallback() {
+            @RequiresApi(api = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
             @Override
             public void onChanged(ObservableList sender) {
+                List<AccettazioneBollaPickingListModel> listaOrdinata = new ArrayList<>();
+                if (!sender.isEmpty()) {
+                    listaOrdinata = new ArrayList<>(sender);
+
+                    Collections.sort(listaOrdinata, (a, b) -> {
+
+                        boolean condA = a.getQtaEvasa().subtract(a.getQtaTot()).floatValue() == 0;
+                        boolean condB = b.getQtaEvasa().subtract(b.getQtaTot()).floatValue() == 0;
+
+                        if (condA && !condB) {
+                            return -1;
+                        } else if (!condA && condB) {
+                            return 1;
+                        }
+                        return 0;
+                    });
+                }
+
                 mDataset.clear();
-                mDataset.addAll(sender);
+                mDataset.addAll(listaOrdinata);
                 notifyDataSetChanged();
                 notifyDataChanged();
             }

From 4b54aa3c02abaab2208e0250ad832311e5a50fe3 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Wed, 15 Jan 2025 16:15:33 +0100
Subject: [PATCH 076/103] =?UTF-8?q?In=20fase=20di=20accettazione=20in=20in?=
 =?UTF-8?q?putQuantity=20proporre=20uno=20nelle=20confezioni=20non=20la=20?=
 =?UTF-8?q?quantit=C3=A0=20presente=20in=20bolla?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccettazioneBollaPickingViewModel.java                    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
index 6e8b80eb..0e94d5e8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
@@ -544,10 +544,6 @@ public class AccettazioneBollaPickingViewModel {
             initialQtaCnf = qtaCnfDaPrelevare;
             initialQtaTot = qtaColDaPrelevare;
 
-        } else if (totalQtaDoc != null) {
-            initialNumCnf = totalNumCnfDoc;
-            initialQtaCnf = qtaCnfDoc;
-            initialQtaTot = totalQtaDoc;
         } else {
             initialNumCnf = BigDecimal.ONE;
             initialQtaCnf = mtbAart.getQtaCnf();

From 778fdff69a6abb405a4a37d747213704cac797e3 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 16 Jan 2025 16:47:18 +0100
Subject: [PATCH 077/103] Implementato cambio deposito in Spedizione (basandosi
 sulla prima UDC scansionata).

Aggiornata icona app.
---
 app/src/main/AndroidManifest.xml              |   2 +-
 app/src/main/ic_launcher-playstore.png        | Bin 0 -> 33537 bytes
 .../core/expansion/BaseActivity.java          |   8 +-
 .../consumers/ColliMagazzinoRESTConsumer.java |  67 +++++++++---
 .../ColliMagazzinoRESTConsumerService.java    |  11 +-
 .../core/rest/model/SpostaULRequestDTO.java   |  61 +++++++++++
 .../rest/model/UpdateTipoULRequestDTO.java    |  27 +++++
 .../ProdRiposizionamentoDaProdViewModel.java  |   2 +-
 .../gest/spedizione/SpedizioneViewModel.java  | 101 ++++++++++++------
 .../VersamentoMerceViewModel.java             |   2 +-
 .../dialogs/base/DialogSimpleMessageView.java |  35 +++---
 app/src/main/res/drawable/app_round_icon.xml  |  74 ++++++-------
 .../res/drawable/ic_launcher_foreground.xml   |  41 +++++++
 app/src/main/res/layout/app_bar_main.xml      |   6 +-
 ..._sheet_fragment__lu_content__list_item.xml |   5 +-
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   2 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   2 +-
 app/src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 3361 -> 0 bytes
 app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 2496 bytes
 .../mipmap-hdpi/ic_launcher_foreground.png    | Bin 5630 -> 0 bytes
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin 5380 -> 0 bytes
 .../res/mipmap-hdpi/ic_launcher_round.webp    | Bin 0 -> 4102 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 2314 -> 0 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 1712 bytes
 .../mipmap-mdpi/ic_launcher_foreground.png    | Bin 3557 -> 0 bytes
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin 3312 -> 0 bytes
 .../res/mipmap-mdpi/ic_launcher_round.webp    | Bin 0 -> 2672 bytes
 app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4600 -> 0 bytes
 .../main/res/mipmap-xhdpi/ic_launcher.webp    | Bin 0 -> 3138 bytes
 .../mipmap-xhdpi/ic_launcher_foreground.png   | Bin 7952 -> 0 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin 7613 -> 0 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.webp   | Bin 0 -> 5628 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 7019 -> 0 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.webp   | Bin 0 -> 4530 bytes
 .../mipmap-xxhdpi/ic_launcher_foreground.png  | Bin 12779 -> 0 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin 11857 -> 0 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.webp  | Bin 0 -> 8312 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 9591 -> 0 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.webp  | Bin 0 -> 6190 bytes
 .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 18511 -> 0 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin 16843 -> 0 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 11292 bytes
 42 files changed, 324 insertions(+), 122 deletions(-)
 create mode 100644 app/src/main/ic_launcher-playstore.png
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/SpostaULRequestDTO.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/UpdateTipoULRequestDTO.java
 create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml
 delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp
 delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
 delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png
 create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
 delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp
 delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
 delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png
 create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
 delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp
 delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
 delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
 delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
 delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
 delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
 delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
 delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
 delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f5a45a2e..3a265d22 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,8 +24,8 @@
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d5d53a15be73b154bf4bf90c2c14acd3cfd799d
GIT binary patch
literal 33537
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
Boj3ph

literal 0
HcmV?d00001

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
index 5cf92c86..7dd9641e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
@@ -53,16 +53,16 @@ public class BaseActivity extends AppCompatActivity {
 
     private void openProgress() {
         BarcodeManager.disable();
-        //executorService.execute(() -> {
+//        executorService.execute(() -> {
             this.mCurrentProgress.show(getSupportFragmentManager());
-        //});
+//        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        //executorService.execute(() -> {
+//        executorService.execute(() -> {
             mCurrentProgress.dismiss();
-        //});
+//        });
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
index ab10d9d8..3dcd2596 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
@@ -11,6 +11,7 @@ import org.jetbrains.annotations.NotNull;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -31,6 +32,8 @@ import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.SpostaULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.UpdateTipoULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CanULBeDeletedRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
@@ -404,11 +407,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void changePosizione(MtbColt mtbColtToMove, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-
-        String codMdep = posizione.getCodMdep();
-        String posizioneString = posizione.getPosizione();
-
+    public void spostaUL(MtbColt mtbColtToMove, String codMdep, String posizione, boolean createDocAutomatically, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         MtbColt mtbColtToMoveClone = (MtbColt) mtbColtToMove.clone();
 
         for (int i = 0; i < mtbColtToMoveClone.getMtbColr().size(); i++) {
@@ -417,26 +416,66 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                     .setMtbPartitaMag(null);
         }
 
+        SpostaULRequestDTO spostaUlRequestDTO = new SpostaULRequestDTO()
+                .setCodMdep(codMdep)
+                .setPosizione(posizione)
+                .setMtbColtsToMove(Collections.singletonList(mtbColtToMoveClone))
+                .setCreateDocAutomatically(createDocAutomatically);
+
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
         colliMagazzinoRESTConsumerService
-                .spostaULInPosizione(codMdep,
-                        posizioneString,
-                        mtbColtToMoveClone)
-                .enqueue(new Callback<ServiceRESTResponse<Object>>() {
+                .spostaUL(spostaUlRequestDTO)
+                .enqueue(new Callback<>() {
                     @Override
-                    public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
-                        analyzeAnswer(response, "changePosizione", mtbColts -> {
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "spostaUL", mtbColts -> {
                             onComplete.run();
                         }, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
                         if (onFailed != null) onFailed.run(new Exception(t));
                     }
                 });
     }
 
+    public void spostaUL(MtbColt mtbColtToMove, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+
+        String codMdep = posizione.getCodMdep();
+        String posizioneString = posizione.getPosizione();
+
+        spostaUL(mtbColtToMove, codMdep, posizioneString, true, onComplete, onFailed);
+    }
+
+    public void updateTipoUL(MtbColt mtbColt, String codTcol, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+
+        MtbColt mtbColtClone = (MtbColt) mtbColt.clone();
+        mtbColtClone.setMtbColr(new ObservableArrayList<>());
+
+        UpdateTipoULRequestDTO updateTipoULRequest = new UpdateTipoULRequestDTO()
+                .setMtbColt(mtbColtClone)
+                .setCodTcol(codTcol);
+
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService
+                .updateTipoUL(updateTipoULRequest)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "updateTipoUL", mtbColts -> {
+                            onComplete.run();
+                        }, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
+                        if (onFailed != null) onFailed.run(new Exception(t));
+                    }
+                });
+
+    }
+
     public void updateDataFine(MtbColt mtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt cloneMtbColt = (MtbColt) mtbColt.clone();
@@ -517,14 +556,14 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
             colliMagazzinoRESTConsumerService.spostaArtsTraUL(spostaArtsTraULRequestDTO).enqueue(new Callback<>() {
                 @Override
-                public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
+                public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                     analyzeAnswer(response, "spostaArtsTraUL", data -> {
                         onComplete.run();
                     }, onFailed);
                 }
 
                 @Override
-                public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
+                public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
                     if (onFailed != null) onFailed.run(new Exception(t));
                 }
             });
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java
index 1e13a7d0..5da77d5e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java
@@ -7,6 +7,8 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.SpostaULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.UpdateTipoULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CanULBeDeletedRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
@@ -31,11 +33,14 @@ public interface ColliMagazzinoRESTConsumerService {
     @POST("creaRettificaCollo")
     Call<ServiceRESTResponse<MtbColr>> creaRettificaCollo(@Query("codMdep") String codMdep, @Body RettificaULDTO rettificaULDTO);
 
-    @POST("wms/spostaULInPosizione")
-    Call<ServiceRESTResponse<Object>> spostaULInPosizione(@Query("codMdep") String codMdep, @Query("posizione") String posizione, @Body MtbColt mtbColtToMove);
+    @POST("wms/updateTipoUL")
+    Call<ServiceRESTResponse<Void>> updateTipoUL(@Body UpdateTipoULRequestDTO requestDto);
+
+    @POST("wms/spostaUL")
+    Call<ServiceRESTResponse<Void>> spostaUL(@Body SpostaULRequestDTO requestDto);
 
     @POST("wms/spostaArtsTraUL")
-    Call<ServiceRESTResponse<Object>> spostaArtsTraUL(@Body SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO);
+    Call<ServiceRESTResponse<Void>> spostaArtsTraUL(@Body SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO);
 
     @POST("wms/assegnaLottoSuColloScarico")
     Call<ServiceRESTResponse<MtbColt>> assegnaLottoSuColloScarico(@Body MtbColt mtbColt);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SpostaULRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SpostaULRequestDTO.java
new file mode 100644
index 00000000..e25ef0db
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SpostaULRequestDTO.java
@@ -0,0 +1,61 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class SpostaULRequestDTO {
+
+    private String codMdep;
+    private String posizione;
+    private String annotazioni;
+    private boolean createDocAutomatically = true;
+    private List<MtbColt> mtbColtsToMove = new ArrayList<>();
+
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public SpostaULRequestDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public String getPosizione() {
+        return posizione;
+    }
+
+    public SpostaULRequestDTO setPosizione(String posizione) {
+        this.posizione = posizione;
+        return this;
+    }
+
+    public String getAnnotazioni() {
+        return annotazioni;
+    }
+
+    public SpostaULRequestDTO setAnnotazioni(String annotazioni) {
+        this.annotazioni = annotazioni;
+        return this;
+    }
+
+    public boolean isCreateDocAutomatically() {
+        return createDocAutomatically;
+    }
+
+    public SpostaULRequestDTO setCreateDocAutomatically(boolean createDocAutomatically) {
+        this.createDocAutomatically = createDocAutomatically;
+        return this;
+    }
+
+    public List<MtbColt> getMtbColtsToMove() {
+        return mtbColtsToMove;
+    }
+
+    public SpostaULRequestDTO setMtbColtsToMove(List<MtbColt> mtbColtsToMove) {
+        this.mtbColtsToMove = mtbColtsToMove;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/UpdateTipoULRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/UpdateTipoULRequestDTO.java
new file mode 100644
index 00000000..066476af
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/UpdateTipoULRequestDTO.java
@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class UpdateTipoULRequestDTO {
+
+    private MtbColt mtbColt;
+    private String codTcol;
+
+    public MtbColt getMtbColt() {
+        return mtbColt;
+    }
+
+    public UpdateTipoULRequestDTO setMtbColt(MtbColt mtbColt) {
+        this.mtbColt = mtbColt;
+        return this;
+    }
+
+    public String getCodTcol() {
+        return codTcol;
+    }
+
+    public UpdateTipoULRequestDTO setCodTcol(String codTcol) {
+        this.codTcol = codTcol;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdViewModel.java
index f08c9147..e30ca795 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdViewModel.java
@@ -143,7 +143,7 @@ public class ProdRiposizionamentoDaProdViewModel {
             this.sendError(new ScannedPositionNotExistException());
         } else {
             if (mtbColt != null) {
-                mColliMagazzinoRESTConsumer.changePosizione(mtbColt, mtbDepoPosizione, () -> {
+                mColliMagazzinoRESTConsumer.spostaUL(mtbColt, mtbDepoPosizione, () -> {
                     List<MvwSitArtUdcDetInventario> mvwSitArtUdcDetInventarioList = mMvwSitArtUdcDetInventarioLiveData.getValue();
 
                     if (mvwSitArtUdcDetInventarioList != null) {
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 8a4b558b..db57f139 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
@@ -855,7 +855,7 @@ public class SpedizioneViewModel {
 
 
     private void loadMatchedRows(List<PickingObjectDTO> matchedRows) {
-        if (matchedRows == null || matchedRows.size() == 0) {
+        if (matchedRows == null || matchedRows.isEmpty()) {
             this.sendError(new NoArtsFoundException());
         } else if (matchedRows.size() == 1) {
             PickingObjectDTO matchedItem = matchedRows.get(0);
@@ -898,9 +898,6 @@ public class SpedizioneViewModel {
 
     public void dispatchOrdineRow(final PickingObjectDTO pickingObjectDTO, MtbColt refMtbColt, MtbColr refMtbColr, boolean canPartitaMagBeChanged) {
 
-        //TODO: Al posto di prelevare la prima riga bisognerebbe controllare se c'è ne una che corrisponde con la partita richiesta
-//        MtbColr refMtbColr = refMtbColt != null ? refMtbColt.getMtbColr().get(0) : null;
-
 
         if (pickingObjectDTO.getTempPickData() != null && pickingObjectDTO.getTempPickData().getSourceMtbColt() != null && pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr() != null) {
 
@@ -1100,8 +1097,12 @@ public class SpedizioneViewModel {
         BigDecimal initialQtaTot = mUseColliPedana ? initialNumCnf.multiply(initialQtaCnf) : mUseQtaOrd ? qtaColDaPrelevare : null;
 
         MtbColt finalRefMtbColt = refMtbColt;
+
         this.onItemDispatched(pickingObjectDTO, pickingObjectDTO.getMtbAart(), initialNumCnf, initialQtaCnf, initialQtaTot, qtaDaEvadere, numCnfDaEvadere, qtaCnfDaEvadere, qtaColDaPrelevare, numCnfDaPrelevare, qtaCnfDaPrelevare, totalQtaAvailable, totalNumCnfAvailable, qtaCnfAvailable, partitaMag, dataScad, mCanOverflowOrderQuantity, canPartitaMagBeChanged, (pickedQuantityDTO, shouldCloseLU) -> {
+
             this.saveNewRow(pickingObjectDTO, finalRefMtbColt, pickedQuantityDTO.getNumCnf(), pickedQuantityDTO.getQtaCnf(), pickedQuantityDTO.getQtaTot(), pickedQuantityDTO.getPartitaMag(), pickedQuantityDTO.getDataScad(), shouldCloseLU);
+
+
         });
     }
 
@@ -1430,50 +1431,80 @@ public class SpedizioneViewModel {
             insertUDSRowRequestDto
                     .setDataScad(dataScad);
 
-        this.mColliScaricoRESTConsumer.insertUDSRow(insertUDSRowRequestDto, createdMtbColr -> {
-            pickingObjectDTO.getWithdrawMtbColrs().add(createdMtbColr);
-            this.mCurrentMtbColt.getMtbColr().add(createdMtbColr);
+        executeDepositChangeIfNeeded(refMtbColt,
+                () -> executeTipoUlChangeIfNeeded(refMtbColt,
+                        () -> this.mColliScaricoRESTConsumer.insertUDSRow(insertUDSRowRequestDto, createdMtbColr -> {
+                            pickingObjectDTO.getWithdrawMtbColrs().add(createdMtbColr);
+                            this.mCurrentMtbColt.getMtbColr().add(createdMtbColr);
 
-            createdMtbColr
-                    .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
-                    .setMtbAart(pickingObjectDTO.getMtbAart());
+                            createdMtbColr
+                                    .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
+                                    .setMtbAart(pickingObjectDTO.getMtbAart());
 
 
-            if (mEnableGiacenza) {
-                MtbColr refMtbColr = new MtbColr()
-                        .setCodMart(createdMtbColr.getCodMart())
-                        .setPartitaMag(createdMtbColr.getPartitaMag())
-                        .setCodTagl(createdMtbColr.getCodTagl())
-                        .setCodCol(createdMtbColr.getCodCol());
+                            if (mEnableGiacenza) {
+                                MtbColr refMtbColr = new MtbColr()
+                                        .setCodMart(createdMtbColr.getCodMart())
+                                        .setPartitaMag(createdMtbColr.getPartitaMag())
+                                        .setCodTagl(createdMtbColr.getCodTagl())
+                                        .setCodCol(createdMtbColr.getCodCol());
 
-                if (refMtbColt != null) {
+                                if (refMtbColt != null) {
 
-                    MtbColr originalRefMtbColr = refMtbColt.getMtbColr() != null && refMtbColt.getMtbColr().size() > 0 ? refMtbColt.getMtbColr().get(0) : null;
+                                    MtbColr originalRefMtbColr = refMtbColt.getMtbColr() != null && !refMtbColt.getMtbColr().isEmpty() ? refMtbColt.getMtbColr().get(0) : null;
 
-                    if (originalRefMtbColr != null) {
-                        refMtbColr.setId(originalRefMtbColr.getId());
-                    }
+                                    if (originalRefMtbColr != null) {
+                                        refMtbColr.setId(originalRefMtbColr.getId());
+                                    }
 
-                    refMtbColr.setNumCollo(refMtbColt.getNumCollo())
-                            .setDataCollo(refMtbColt.getDataColloS())
-                            .setSerCollo(refMtbColt.getSerCollo())
-                            .setGestione(refMtbColt.getGestione());
-                }
-                createdMtbColr.setRefMtbColr(refMtbColr);
-            }
+                                    refMtbColr.setNumCollo(refMtbColt.getNumCollo())
+                                            .setDataCollo(refMtbColt.getDataColloS())
+                                            .setSerCollo(refMtbColt.getSerCollo())
+                                            .setGestione(refMtbColt.getGestione());
+                                }
+                                createdMtbColr.setRefMtbColr(refMtbColr);
+                            }
 
-            //Chiamato removeListFilter perché cosi mi cancella tutti i dati di pick temporanei
-            resetMatchedRows();
+                            //Chiamato removeListFilter perché cosi mi cancella tutti i dati di pick temporanei
+                            resetMatchedRows();
 
-            this.sendOnRowSaved();
-            this.sendOnLoadingEnded();
+                            this.sendOnRowSaved();
+                            this.sendOnLoadingEnded();
 
-            if (shouldCloseLU) requestCloseLU(shouldPrint);
+                            if (shouldCloseLU) requestCloseLU(shouldPrint);
 
-        }, this::sendError);
+                        }, this::sendError)));
 
     }
 
+    private void executeDepositChangeIfNeeded(MtbColt refMtbColt, Runnable onComplete) {
+        //Considero solo la prima UDC scansionata
+        boolean shouldChangeCodMdep = refMtbColt != null && !refMtbColt.getCodMdep().equalsIgnoreCase(mCurrentMtbColt.getCodMdep()) &&
+                mCurrentMtbColt.getMtbColr().isEmpty();
+        String newCodMdep = shouldChangeCodMdep ? refMtbColt.getCodMdep() : null;
+
+        if (shouldChangeCodMdep) {
+            mColliMagazzinoRESTConsumer.spostaUL(mCurrentMtbColt, newCodMdep, null, false, () -> {
+                mCurrentMtbColt.setCodMdep(newCodMdep);
+                onComplete.run();
+            }, this::sendError);
+        } else onComplete.run();
+    }
+
+    private void executeTipoUlChangeIfNeeded(MtbColt refMtbColt, Runnable onComplete) {
+        boolean shouldChangeCodTcol = refMtbColt != null && refMtbColt.getCodTcol() != null &&
+                !refMtbColt.getCodTcol().equalsIgnoreCase(mCurrentMtbColt.getCodTcol()) &&
+                mCurrentMtbColt.getMtbColr().isEmpty();
+        String newTipoUL = shouldChangeCodTcol ? refMtbColt.getCodTcol() : null;
+
+        if (shouldChangeCodTcol) {
+            mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL, () -> {
+                mCurrentMtbColt.setCodTcol(newTipoUL);
+                onComplete.run();
+            }, this::sendError);
+        } else onComplete.run();
+    }
+
     private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
 
         this.sendOnLoadingStarted();
@@ -1732,7 +1763,7 @@ public class SpedizioneViewModel {
     }
 
     private void askInfoAggiuntive(Runnable onComplete) {
-        if (mDefaultSegnoCol != -1 || !SettingsManager.iDB().isFlagAskInfoAggiuntiveSpedizione()) {
+        if (!SettingsManager.iDB().isFlagAskInfoAggiuntiveSpedizione()) {
             onComplete.run();
             return;
         }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java
index 8edf5632..4a2388ef 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java
@@ -302,7 +302,7 @@ public class VersamentoMerceViewModel {
 
     public void updatePosizione(MtbDepoPosizione mtbDepoPosizione) {
         this.sendOnLoadingStarted();
-        mColliMagazzinoRESTConsumer.changePosizione(mCurrentMtbColt.getValue(), mtbDepoPosizione, () -> {
+        mColliMagazzinoRESTConsumer.spostaUL(mCurrentMtbColt.getValue(), mtbDepoPosizione, () -> {
             this.sendOnLoadingEnded();
             this.sendOnDataSaved();
         }, this::sendError);
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java
index 6189f6b9..69bde96f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java
@@ -136,31 +136,26 @@ public class DialogSimpleMessageView extends BaseDialogFragment {
 
     private void initContent() {
         int colorBackgroundTitle = -1;
-        Drawable titleIconRes = null;
-
-        switch (mType) {
-            case INFO:
+        Drawable titleIconRes = switch (mType) {
+            case INFO -> {
                 colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.colorPrimary);
-                titleIconRes = ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_info_78dp, null);
-                break;
-
-            case SUCCESS:
+                yield ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_info_78dp, null);
+            }
+            case SUCCESS -> {
                 colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.green_300);
-                titleIconRes = ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_done_white_24dp, null);
-                break;
-
-            case WARNING:
+                yield ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_done_white_24dp, null);
+            }
+            case WARNING -> {
                 colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.yellow_600);
-                titleIconRes = ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_warning_white_24dp, null);
-                break;
-
-            case ERROR:
+                yield ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_warning_white_24dp, null);
+            }
+            case ERROR -> {
                 colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.red_300);
-                titleIconRes = ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_mood_bad_24dp, null);
-                break;
-        }
+                yield ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_mood_bad_24dp, null);
+            }
+        };
 
-        this.positiveButtonText = requireContext().getText(R.string.ok).toString();
+        this.positiveButtonText = requireContext().getText(mOnNegativeClick != null ? R.string.yes : R.string.ok).toString();
         this.negativeButtonText = requireContext().getText(R.string.no).toString();
 
         //Title VIEW
diff --git a/app/src/main/res/drawable/app_round_icon.xml b/app/src/main/res/drawable/app_round_icon.xml
index 943787b8..249bed37 100644
--- a/app/src/main/res/drawable/app_round_icon.xml
+++ b/app/src/main/res/drawable/app_round_icon.xml
@@ -1,37 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M256,485.5c-61.3,0-118.9-23.9-162.3-67.2c-43.3-43.3-67.2-101-67.2-162.3S50.4,137.1,93.7,93.7 c43.3-43.3,101-67.2,162.3-67.2s118.9,23.9,162.3,67.2c43.3,43.3,67.2,101,67.2,162.3s-23.9,118.9-67.2,162.3 C374.9,461.6,317.3,485.5,256,485.5z" />
-    <path
-        android:fillColor="#CCCCCC"
-        android:pathData="M256,27c30.9,0,60.9,6.1,89.1,18c27.3,11.5,51.8,28,72.8,49.1c21,21,37.5,45.5,49.1,72.8 c11.9,28.2,18,58.2,18,89.1s-6.1,60.9-18,89.1c-11.5,27.3-28,51.8-49.1,72.8c-21,21-45.5,37.5-72.8,49.1 c-28.2,11.9-58.2,18-89.1,18s-60.9-6.1-89.1-18c-27.3-11.5-51.8-28-72.8-49.1c-21-21-37.5-45.5-49.1-72.8 c-11.9-28.2-18-58.2-18-89.1s6.1-60.9,18-89.1c11.5-27.3,28-51.8,49.1-72.8c21-21,45.5-37.5,72.8-49.1C195.1,33.1,225.1,27,256,27 M256,26C129,26,26,129,26,256s103,230,230,230s230-103,230-230S383,26,256,26L256,26z" />
-    <path
-        android:fillColor="#FF9900"
-        android:pathData="M443.6,222.4C427.8,132.9,349.7,65,255.8,65c-23.9,0-46.7,4.4-67.8,12.4l14.3,36.4c16-5.8,33.4-9,51.4-9 c74.1,0,135.8,53.4,148.5,123.9L443.6,222.4z" />
-    <path
-        android:fillColor="#EC0200"
-        android:pathData="M250.9,446.5c1.6,0,3.2,0.1,4.9,0.1c105.4,0,190.8-85.4,190.8-190.8c0-3.3-0.1-6.6-0.3-9.9l-41.8,1.4 c0.2,2.8,0.2,5.6,0.2,8.5c0,83.4-69.5,150.9-152.9,150.9L250.9,446.5" />
-    <path
-        android:fillColor="#349933"
-        android:pathData="M126.1,395.7c26,24.1,58.8,41,95.1,47.7l6.6-38.9c-28.8-5-55.3-18.7-76.1-37.5L126.1,395.7" />
-    <path
-        android:fillColor="#0199CB"
-        android:pathData="M160.6,90.4C103.5,123.3,65,185,65,255.8c0,45.3,15.8,86.9,42.1,119.6l29.7-24c-21.3-26-34.1-59.3-34.1-95.6 c0-56.4,30.9-105.5,76.7-131.5L160.6,90.4" />
-    <path
-        android:pathData="M 113.4 205 H 471.3 V 346.3 H 113.4 V 205 Z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M168,250.1l-13.8,45.3h-19.4l-23.2-66.4h18.4l14.6,46.5l14.5-46.5h18.6l14.8,46.5l14.6-46.5h18l-22.5,66.4h-20.2L168,250.1 z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M225.2,229.1h67.3c9.8,0,16.8,1.9,21.1,5.7s6.5,10,6.5,18.6v42.1h-17.7v-39.8c0-4.9-0.7-8.1-2.2-9.7 c-1.5-1.6-4.5-2.3-9.1-2.3h-9.8v51.8h-17.9v-51.8h-20.5v51.8h-17.7V229.1z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M328.8,281.6h37c3.3,0,5.7-0.5,7.2-1.5c1.5-1,2.2-2.7,2.2-4.9c0-2.3-0.8-3.9-2.3-5c-1.5-1-3.9-1.6-7.1-1.6h-15.1 c-9,0-15.1-1.4-18.2-4.1c-3.2-2.7-4.7-7.6-4.7-14.6c0-7.1,1.9-12.4,5.7-15.8c3.8-3.4,9.7-5,17.7-5h37.7v13.8h-30.9 c-5,0-8.3,0.4-9.8,1.3c-1.5,0.9-2.3,2.5-2.3,4.7c0,2.1,0.7,3.6,2,4.5c1.3,1,3.4,1.4,6.3,1.4h15.9c7.3,0,12.8,1.7,16.6,5.1 c3.8,3.4,5.7,8.3,5.7,14.7c0,6.2-1.7,11.2-5.1,15c-3.4,3.9-7.7,5.8-13.1,5.8h-45.3V281.6z" />
-</vector>
\ No newline at end of file
+    android:width="222.9dp"
+    android:height="222.9dp"
+    android:viewportWidth="222.9"
+    android:viewportHeight="222.9">
+  <path
+      android:pathData="M190.62,137.94c-0.67,0 -1.34,-0.06 -2.02,-0.18 -6.2,-1.11 -10.33,-7.04 -9.22,-13.24 0.72,-4 1.08,-8.11 1.08,-12.21 0,-8.6 -1.56,-16.98 -4.64,-24.91 -2.28,-5.88 0.63,-12.49 6.51,-14.77 5.88,-2.28 12.49,0.64 14.77,6.51 4.1,10.58 6.18,21.73 6.18,33.17 0,5.45 -0.48,10.91 -1.43,16.23 -0.99,5.52 -5.8,9.4 -11.22,9.4Z"
+      android:fillColor="#269c38"/>
+  <path
+      android:pathData="M167.26,65.87c-2.85,0 -5.7,-1.06 -7.91,-3.19 -12.9,-12.42 -29.87,-19.27 -47.78,-19.27 -4.06,0 -8.12,0.35 -12.07,1.05 -6.2,1.09 -12.13,-3.05 -13.22,-9.25 -1.1,-6.21 3.05,-12.13 9.25,-13.22 5.26,-0.93 10.66,-1.4 16.04,-1.4 23.85,0 46.44,9.11 63.62,25.65 4.54,4.37 4.67,11.6 0.3,16.13 -2.24,2.33 -5.23,3.5 -8.22,3.5Z"
+      android:fillColor="#e62400"/>
+  <path
+      android:pathData="M111.45,111.45m-111.45,0a111.45,111.45 0,1 1,222.9 0a111.45,111.45 0,1 1,-222.9 0"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M35.21,149.37c-4.78,0 -9.23,-3.02 -10.83,-7.79 -3.16,-9.41 -4.76,-19.26 -4.76,-29.27 0,-29.92 14.63,-58.06 39.14,-75.28 5.17,-3.63 12.29,-2.38 15.92,2.78 3.63,5.16 2.38,12.29 -2.78,15.92 -18.43,12.94 -29.43,34.1 -29.43,56.58 0,7.54 1.2,14.94 3.57,22 2.01,5.98 -1.21,12.46 -7.2,14.47 -1.21,0.4 -2.43,0.6 -3.64,0.6Z"
+      android:fillColor="#f39200"/>
+  <path
+      android:pathData="M111.56,204.25c-24.94,0 -48.28,-9.82 -65.72,-27.64 -4.41,-4.51 -4.33,-11.74 0.17,-16.16s11.74,-4.33 16.16,0.18c13.11,13.4 30.65,20.77 49.39,20.77 22.28,0 43.32,-10.84 56.28,-29 3.67,-5.14 10.8,-6.33 15.94,-2.66 5.14,3.67 6.33,10.8 2.66,15.94 -17.24,24.16 -45.24,38.58 -74.88,38.58Z"
+      android:fillColor="#00a0de"/>
+  <path
+      android:pathData="M190.62,137.94c-0.67,0 -1.34,-0.06 -2.02,-0.18 -6.2,-1.11 -10.33,-7.04 -9.22,-13.24 0.72,-4 1.08,-8.11 1.08,-12.21 0,-8.6 -1.56,-16.98 -4.64,-24.91 -2.28,-5.88 0.63,-12.49 6.51,-14.77 5.88,-2.28 12.49,0.64 14.77,6.51 4.1,10.58 6.18,21.73 6.18,33.17 0,5.45 -0.48,10.91 -1.43,16.23 -0.99,5.52 -5.8,9.4 -11.22,9.4Z"
+      android:fillColor="#269c38"/>
+  <path
+      android:pathData="M167.26,65.87c-2.85,0 -5.7,-1.06 -7.91,-3.19 -12.9,-12.42 -29.87,-19.27 -47.78,-19.27 -4.06,0 -8.12,0.35 -12.07,1.05 -6.2,1.09 -12.13,-3.05 -13.22,-9.25 -1.1,-6.21 3.05,-12.13 9.25,-13.22 5.26,-0.93 10.66,-1.4 16.04,-1.4 23.85,0 46.44,9.11 63.62,25.65 4.54,4.37 4.67,11.6 0.3,16.13 -2.24,2.33 -5.23,3.5 -8.22,3.5Z"
+      android:fillColor="#e62400"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M144.99,151.22c-2.08,0 -4.13,-0.28 -6.15,-0.83 -2.03,-0.56 -3.89,-1.33 -5.58,-2.32 -1.69,-0.99 -3.16,-2.14 -4.42,-3.44l6.37,-6.37c1.21,1.26 2.59,2.23 4.16,2.93 1.57,0.7 3.32,1.05 5.25,1.05 1.21,0 2.16,-0.19 2.86,-0.58 0.7,-0.39 1.05,-0.94 1.05,-1.67 0,-0.87 -0.41,-1.51 -1.23,-1.92 -0.82,-0.41 -1.9,-0.8 -3.22,-1.16 -1.33,-0.36 -2.71,-0.77 -4.16,-1.23 -1.45,-0.46 -2.82,-1.07 -4.13,-1.85 -1.3,-0.77 -2.37,-1.83 -3.19,-3.18 -0.82,-1.35 -1.23,-3.11 -1.23,-5.29s0.58,-4.24 1.74,-5.9c1.16,-1.67 2.8,-2.98 4.92,-3.95s4.66,-1.45 7.6,-1.45 5.7,0.52 8.26,1.56c2.56,1.04 4.61,2.57 6.15,4.6l-6.3,6.45c-1.11,-1.3 -2.35,-2.23 -3.73,-2.79 -1.38,-0.55 -2.71,-0.83 -4.02,-0.83s-2.2,0.19 -2.82,0.58c-0.63,0.39 -0.94,0.89 -0.94,1.52 0,0.72 0.42,1.3 1.27,1.74 0.84,0.43 1.91,0.82 3.19,1.16 1.28,0.34 2.64,0.74 4.09,1.2 1.45,0.46 2.82,1.11 4.13,1.95 1.3,0.84 2.36,1.95 3.19,3.33 0.82,1.37 1.23,3.17 1.23,5.39 0,3.43 -1.29,6.17 -3.87,8.22 -2.58,2.05 -6.07,3.08 -10.46,3.08Z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M129.58,69.43l-6.28,20.92l-6.8,-20.92l-9.41,0l-6.76,20.99l-6.24,-20.99l-11.28,0l12.55,36.31l9.41,0l7.09,-20.88l6.96,20.88l9.41,0l12.63,-36.31l-11.28,0z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M119.23,120.88c-1.21,-2.08 -2.87,-3.68 -5,-4.82 -2.13,-1.13 -4.51,-1.7 -7.17,-1.7s-5.24,0.58 -7.46,1.74c-1.5,0.78 -2.76,1.81 -3.84,3.05 -1.01,-1.27 -2.23,-2.31 -3.65,-3.12 -1.96,-1.11 -4.14,-1.67 -6.55,-1.67 -2.66,0 -5.01,0.54 -7.06,1.63 -0.93,0.49 -1.77,1.1 -2.53,1.78l0.04,-2.68h-11.15l-0.2,14.83h11.35s0,-0.2 0,-0.2c0,-1.16 0.25,-2.15 0.76,-2.97 0.51,-0.82 1.2,-1.46 2.06,-1.92 0.87,-0.46 1.86,-0.69 2.97,-0.69 1.59,0 2.93,0.5 4.02,1.48 1.09,0.99 1.63,2.35 1.63,4.09v20.56h11.15v-20.56c0,-1.16 0.24,-2.15 0.72,-2.97 0.48,-0.82 1.17,-1.46 2.06,-1.92 0.89,-0.46 1.87,-0.69 2.93,-0.69 1.54,0 2.86,0.5 3.95,1.48 1.09,0.99 1.63,2.35 1.63,4.09v20.56h11.15v-21.87c0,-2.94 -0.6,-5.45 -1.81,-7.53Z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M70.36,142.69m-7.58,0a7.58,7.58 0,1 1,15.16 0a7.58,7.58 0,1 1,-15.16 0"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 00000000..d7972540
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="222.9"
+    android:viewportHeight="222.9">
+  <group android:scaleX="0.72"
+      android:scaleY="0.72"
+      android:translateX="31.206"
+      android:translateY="31.206">
+    <path
+        android:pathData="M190.6,137.9c-0.7,0 -1.3,0 -2,-0.2 -6.2,-1.1 -10.3,-7 -9.2,-13.2 0.7,-4 1.1,-8.1 1.1,-12.2 0,-8.6 -1.6,-17 -4.6,-24.9 -2.3,-5.9 0.6,-12.5 6.5,-14.8 5.9,-2.3 12.5,0.6 14.8,6.5 4.1,10.6 6.2,21.7 6.2,33.2s-0.5,10.9 -1.4,16.2c-1,5.5 -5.8,9.4 -11.2,9.4h0Z"
+        android:fillColor="#269c38"/>
+    <path
+        android:pathData="M167.3,65.9c-2.9,0 -5.7,-1.1 -7.9,-3.2 -12.9,-12.4 -29.9,-19.3 -47.8,-19.3s-8.1,0.3 -12.1,1c-6.2,1.1 -12.1,-3 -13.2,-9.2 -1.1,-6.2 3.1,-12.1 9.2,-13.2 5.3,-0.9 10.7,-1.4 16,-1.4 23.9,0 46.4,9.1 63.6,25.6 4.5,4.4 4.7,11.6 0.3,16.1 -2.2,2.3 -5.2,3.5 -8.2,3.5h0Z"
+        android:fillColor="#e62400"/>
+    <path
+        android:pathData="M35.2,149.4c-4.8,0 -9.2,-3 -10.8,-7.8 -3.2,-9.4 -4.8,-19.3 -4.8,-29.3 0,-29.9 14.6,-58.1 39.1,-75.3 5.2,-3.6 12.3,-2.4 15.9,2.8 3.6,5.2 2.4,12.3 -2.8,15.9 -18.4,12.9 -29.4,34.1 -29.4,56.6s1.2,14.9 3.6,22c2,6 -1.2,12.5 -7.2,14.5 -1.2,0.4 -2.4,0.6 -3.6,0.6h0Z"
+        android:fillColor="#f39200"/>
+    <path
+        android:pathData="M111.6,204.3c-24.9,0 -48.3,-9.8 -65.7,-27.6 -4.4,-4.5 -4.3,-11.7 0.2,-16.2s11.7,-4.3 16.2,0.2c13.1,13.4 30.6,20.8 49.4,20.8s43.3,-10.8 56.3,-29c3.7,-5.1 10.8,-6.3 15.9,-2.7s6.3,10.8 2.7,15.9c-17.2,24.2 -45.2,38.6 -74.9,38.6h0Z"
+        android:fillColor="#00a0de"/>
+    <path
+        android:pathData="M190.6,137.9c-0.7,0 -1.3,0 -2,-0.2 -6.2,-1.1 -10.3,-7 -9.2,-13.2 0.7,-4 1.1,-8.1 1.1,-12.2 0,-8.6 -1.6,-17 -4.6,-24.9 -2.3,-5.9 0.6,-12.5 6.5,-14.8 5.9,-2.3 12.5,0.6 14.8,6.5 4.1,10.6 6.2,21.7 6.2,33.2s-0.5,10.9 -1.4,16.2c-1,5.5 -5.8,9.4 -11.2,9.4h0Z"
+        android:fillColor="#269c38"/>
+    <path
+        android:pathData="M167.3,65.9c-2.9,0 -5.7,-1.1 -7.9,-3.2 -12.9,-12.4 -29.9,-19.3 -47.8,-19.3s-8.1,0.3 -12.1,1c-6.2,1.1 -12.1,-3 -13.2,-9.2 -1.1,-6.2 3.1,-12.1 9.2,-13.2 5.3,-0.9 10.7,-1.4 16,-1.4 23.9,0 46.4,9.1 63.6,25.6 4.5,4.4 4.7,11.6 0.3,16.1 -2.2,2.3 -5.2,3.5 -8.2,3.5h0Z"
+        android:fillColor="#e62400"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M145,151.2c-2.1,0 -4.1,-0.3 -6.1,-0.8 -2,-0.6 -3.9,-1.3 -5.6,-2.3s-3.2,-2.1 -4.4,-3.4l6.4,-6.4c1.2,1.3 2.6,2.2 4.2,2.9s3.3,1.1 5.2,1.1 2.2,-0.2 2.9,-0.6 1.1,-0.9 1.1,-1.7 -0.4,-1.5 -1.2,-1.9c-0.8,-0.4 -1.9,-0.8 -3.2,-1.2 -1.3,-0.4 -2.7,-0.8 -4.2,-1.2 -1.4,-0.5 -2.8,-1.1 -4.1,-1.9 -1.3,-0.8 -2.4,-1.8 -3.2,-3.2 -0.8,-1.4 -1.2,-3.1 -1.2,-5.3s0.6,-4.2 1.7,-5.9c1.2,-1.7 2.8,-3 4.9,-3.9s4.7,-1.4 7.6,-1.4 5.7,0.5 8.3,1.6 4.6,2.6 6.1,4.6l-6.3,6.4c-1.1,-1.3 -2.4,-2.2 -3.7,-2.8 -1.4,-0.6 -2.7,-0.8 -4,-0.8s-2.2,0.2 -2.8,0.6c-0.6,0.4 -0.9,0.9 -0.9,1.5s0.4,1.3 1.3,1.7c0.8,0.4 1.9,0.8 3.2,1.2 1.3,0.3 2.6,0.7 4.1,1.2 1.4,0.5 2.8,1.1 4.1,1.9 1.3,0.8 2.4,1.9 3.2,3.3 0.8,1.4 1.2,3.2 1.2,5.4 0,3.4 -1.3,6.2 -3.9,8.2s-6.1,3.1 -10.5,3.1h0Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M129.6,69.4l-6.3,20.9l-6.8,-20.9l-9.4,0l-6.8,21l-6.2,-21l-11.3,0l12.6,36.3l9.4,0l7.1,-20.8l6.9,20.8l9.4,0l12.7,-36.3l-11.3,0z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M119.2,120.9c-1.2,-2.1 -2.9,-3.7 -5,-4.8 -2.1,-1.1 -4.5,-1.7 -7.2,-1.7s-5.2,0.6 -7.5,1.7c-1.5,0.8 -2.8,1.8 -3.8,3.1 -1,-1.3 -2.2,-2.3 -3.7,-3.1 -2,-1.1 -4.1,-1.7 -6.6,-1.7s-5,0.5 -7.1,1.6c-0.9,0.5 -1.8,1.1 -2.5,1.8v-2.7s-11.1,0 -11.1,0l-0.2,14.8h11.3v-0.2c0,-1.2 0.2,-2.2 0.8,-3s1.2,-1.5 2.1,-1.9c0.9,-0.5 1.9,-0.7 3,-0.7 1.6,0 2.9,0.5 4,1.5 1.1,1 1.6,2.3 1.6,4.1v20.6h11.2v-20.6c0,-1.2 0.2,-2.2 0.7,-3s1.2,-1.5 2.1,-1.9 1.9,-0.7 2.9,-0.7c1.5,0 2.9,0.5 3.9,1.5 1.1,1 1.6,2.3 1.6,4.1v20.6h11.2v-21.9c0,-2.9 -0.6,-5.4 -1.8,-7.5h0Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M70.4,142.7m-7.6,0a7.6,7.6 0,1 1,15.2 0a7.6,7.6 0,1 1,-15.2 0"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 02f04f8a..da3cfa4c 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -33,12 +33,10 @@
                     android:layout_gravity="center">
 
                         <androidx.appcompat.widget.AppCompatImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
+                            android:layout_width="36dp"
+                            android:layout_height="36dp"
                             android:src="@drawable/app_round_icon"
                             android:adjustViewBounds="true"
-                            android:paddingTop="8dp"
-                            android:paddingBottom="8dp"
                             android:layout_gravity="center"/>
 
                         <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
index afa38080..86e9c332 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
@@ -25,7 +25,10 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="8dp">
+        android:padding="8dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?attr/selectableItemBackground">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/art_detail"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 036d09bc..7353dbd1 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 036d09bc..7353dbd1 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 5a51dba6a68656cf7462d912e5ed5533b6938a65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3361
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

diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..6582824dc4df68a084e7a4e8054bb86e31b4cb36
GIT binary patch
literal 2496
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
KaSJ5wL?r^rmgiUi

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index f5fbca90c4059ea7f7e4e7d2e609913ea277fcd0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5630
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
L>hjgH7N7qQPZr|L

diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index c887da066ff5f9863cd241a56b72ecc9fc2770d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5380
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

diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..ce973e521357500eee6904e79dd48573ac0a37ff
GIT binary patch
literal 4102
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
E01M~NX8-^I

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 42fd3eb14bf70673197505f7570d9e7cfc6b814c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2314
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

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..a48e025e825980c9ac9fca8f776b9eeb6405600b
GIT binary patch
literal 1712
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
G^GOt+OKAB3

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index d1ad74facf97aa54e0a65ff5ef9b5b8d4c99b3be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3557
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
Jw^kdT@IPj--su1U

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index d4d733d42a8d5a9e61ff842724811ceb53c1ed51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3312
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

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..f7ec9b38b06ed7269c7a4c9d88c13e66da9fa265
GIT binary patch
literal 2672
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bab2c0092612989163ff7cc83dc119d92f80fa50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4600
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

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..5a3648034fd8d7d58b22ea098f41d7de75e7a721
GIT binary patch
literal 3138
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index bb45d61ad511a77c66662c3fceecb58555e654b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7952
zcmcgxRaYEruSLsXMT;{)ad#*(@Zw(FVQ?t!Zp9hgifgeJcc-|!OOau4cPM`N{=`}9
zk-H=p**nP&MCGdtCK?GE92^{`oUEkU`@j6Z3;6K<LMT~J;oyKva*|>iUaO}$s5(me
zPu+5=KT$2TMpAGyHJG@6jCSr_s`c}N^J=+__(itgzy|WJ^76?lGx-SxJd6X0*bqSp
zJVS}|!1Ljy36X`B{cOR7C*Ry#FJMmNl*qYmSN)>T{i<!VZ3HDC`2Xo3AaBrp4Liu-
zhF(dcwD3$)2=Ba5>Fi?~%p-hRBJ7s<(A`Sz?tF{^ox`L24-tAr1IHdl37EN!SeCM)
zT=V*{6ZUlgKy5Em@|-T>G%}CznFT~O55@WS@fXrkoF?@1pyB7XFyTF22-C%psvO`S
zpm)ey{Dj@(;wtlF0G{kIc3F)I$t;#$?`_5;cEt<QTG3`mbPLo1CMC#!sEjQbj;LMY
z)q|<8zz~x(=!j;mYg&B58^XLN;$*^5??bd?AkM2{AcWI5Eushjo=V&}XmyYN7;wbG
zv2VrYXQ$j#GLqC{s;ZMiFd(`jFirjU-{9sd+%&LDN%971d*@fT_retcz0N7D5(!&`
z3jXYQ2n`17ztoqKRHz$1++fwK$%JhnL!a}ru(^kD>ktHC{Lzu&##r%6@b^`D`eEjq
z5%CguTYH&@aJmd6pS{?)();Z3au0d+>Nxu7E2V4Bm)48ms}wu2ninyK2!a4e`#a{S
z?V<ZZC=XVCi-2Jm5@)(UDXq@U+7IX~yk3s^f-BF!l#_i4GYv4gmmqk0k1Rw$ikX91
zYFq$yHIO-a+eMjQzNQ1);^I_$mI=9>5&p=L^5vfk+`;!sWNRLb4{n)wFK(qjJ&!zV
zZK9GqnXEKT1M;Nh2pnLGWys~aRiB!_AP^l3nv98&^uKZHk8$t_wN~jgj-4DUQ@;oD
zSYUlyMQf)-t5XU9=I{&=ggWhZStFPGJQQ`7E3?(P-78iKCfzmlgf;98=mE$Q#azRX
zvEAXt2NP`33L$Ut|G);cW>h*@(B7KrXn!e-s{OfZ^!~}sU{=%zLPa>@Yrvp`cYF#v
z=7^?x1DmB3e;HwP4H$Luv^A0j8OmRS&xQdBQwd3SvVh4C3)W*G>{x8I<*@907)D^$
zZ8|GM`wlWq@HHez%7H9Rq=r=__fef*$OGmLP!s2>gR8InFDT}PVL7L=vP~Q$MEmA7
z7F4I%uDW&gRiM~pH>L2wQ7Hn(C6qi*5QEN4zHxlqJ;G*yg%ROj4@%z>(-vVWoX;h1
zC|t@!Vp`vW^F{GE8F3>b-b#_0`7^o)67>O>XTh7_OAIy0I9NXBwv?Nq+xD?^j3yA{
zq`Mb}DBvo)Ea1N+$gsOcMYZuQL(K?%#g>=hWY;)IfkK{+M^m~W4J83CxHJ1rgfx0u
zoTR|L)pE27>>;dKOR+m*L_2Hy1k!4GOt)Z)PJGuAdO}^nT%~aD8RezshN+KOSeT(-
zvO=))UmJXWgmXw;t6TPgd{Zh|w+4(!Vlc<{8ulfsGJl?Af&W1bi}e&@5O=&~drxn#
zDd!n9f31Aod?hoLjY(=mHU+1V#I>al5QG|-Q$?gjo8`4O?4&0gqf=ea`vJHEC>x%Z
zgg-4~ca3A~8#B|vEFe{?-{QJ=9#c<#>EYygmh$#T7$m~qlM{+}Llq0wyifneV|q5n
z4x}!l>5`<;^LO*Vq~`bIQu|aT64s}C@Po%4>}!MTxTIS6hT#2tv;hWOfxLXe9ugyZ
zc+PfB*>XB}_F^Nn$GK{}{DSv>vOxVR-XTn2t4(+DrJR#ihkSlgSj<*;pZZIUMH4PT
z|Bf^SRkn(X5LkD5zW=tC3PVA)&5qnqtO4mJ+>sAQC-*I`%tnOs=bj(C@nyVGQK`m=
z*Kgx)r2K9k_#%EJ)_0UEldv=bOC2;px9_oQzg|_FVQ!2vYAsp^c9&&M`Ol#jC^<TR
zfcWB5`aLTJ85Vi`s0jXhd~c>;AB40|fJqnO`aHVO$NXt=!><<JQ}>aM___+C|HY-&
zN370x_Wo14u3b<}R|@&mc}IDdqt6e8$#zVl3Be?>_B(75XWQG7F9>oz2cN{ifXN{}
zv~q_(%dF0P59om)?bR$%U`IyC%nluKL&Wkxk+~*<E*Y8iZiK2mJXxR)huwF_NBV%B
z&&Q5!Po`Yb^*BEVSXZTG@1)@L`!&UqwiRQ3MZT5AVUEc`Wvaj;)_DfbI>Y*F?8+O`
z<0B&I(5i1A@x$B)BBL0D&h{M>pwzVN+qqZP$2rfpL~<lav=wo|^$0p(_l4)KbQN5&
z>}1`#J~m<V*&opzTP_2!9cDywnZb!G0~ePwex(;9=&Kol)+UltcHh2v+>VF^uzl8-
z2DPdIzQ<o}?fVX6o?{h+OZnZKZsD226SXM(_~rC~EaMA(z*v=#=$k%i4v1H1H={wO
zTmi|DU!+)FcG3qtQYm^xq7i84{+szxzS-*L)NzlS_sAeS;!yo}@ILH7VY?3g%6T8U
zH+b({3#Q29S#8d)=)CPkEo3;L@-5(zOy7h)1>t#~TAA=<Wn?V5ARgR-OSS}vArIfX
zl6n&=C|!8|-I-nS6O!Ho^7FZ+>ofidZC93+84X(LEwy*dLF4DOsX3#>Q%)A!Sp7~X
z4%iT}yAYa*zp({GnUdwVZ#X%haI<%8d^YcSFABZ1+cM9U>hoB=vV4fT=cB$hNR|XM
ztEi*woy!8m5kRHSD`xTD(2XB?r!Au5kLMB`NlN2KS?v4QZKRG9Y%14gF3o00Sxj4E
zXH%kF3Dsbh*+;AxbG$<0bYjKh)WElh^D3^47Dpd-`P3HG<Z8`(_&zWkBD*j@F+6+v
zQK$bbllKpWHCkdz!@xFT>Sc^1WNVb`+k@3~BSnrVrT(jb9j9)0$=a7=P_KrooP0^G
zng(k1@@7Cjv+l1RxfoMC6SCACaVxKX3U<Ja`K9b6<l~~b&24bwcOqt3p-q?)Zn<J%
zspl#Rc=rf)mk$%Y2V)Kb_zH~^7Ztvp6DfYgbF3ndP{rqp{^?36-*S-)A|t;!;FGS-
zKxS6d4t0G|u)a6tbbT9SKqHR*KHha$w70Z2`h;0XkB}s#*d?i7(~a|+NQ{d6%5+hP
z<S(2?=zc0j?*Zhyv0OXB9N7AtO&zWJXS)f0m?T`t?~RpP_^Cthkm(bBA`lMFiJ_MA
zm!-6g7gH-*xGH_+0R}XP_mV5&bVeX+*QFnYv~nm7`XXi_NHHc8a?N3KIma6=RP8e2
zThe{^#O}`N^O;7cxB6ql{n>^3#~uJ0YT@(=4H#KnC{J~mAq4pD0{7(1!~Q}e|Gqm?
zrSJYd&H{JNV^DRlQfqc{WFj7C&lO&AxBjJ6rzf{BbK=ut*LRf=D<_9;#>mVqBuLlF
zf6r=4G5Oe$V~BEcOXj)k99iKOf0J+VaB+PM+C3^g*Kx_$TPifb;9N4z7yV|3Te?@e
z72`q#Yy~;FLnU_%leGDHjUZMmg|A=FzV4F+L=I_QyImw8JEgG&|2MIOZRv(CK13Gc
zm8FF3P=PWfelu((V>agadCfJdQs}DXH-k6#-kooC8O5cIt!>s9(|*7&eY&sN!yfML
zn%@pyAdhSsw=!{Ls84sNwodi4bEV46Uo&}7f5r8jz9DOBXlicC%F5DUP>2ZkjE)}l
zUhR%q2?z;|@rlzxwuj=C>uPG8=#HbJqv<h-xr#z31;%qhPex<e(5MHv;m0weC>JMs
zBUR()VlrDW;XjXi`LF@iDb3->XhQZ4*??+yg@}*j#&54LuB1MJKTSXdWy-16b0xf9
z#KvQ(thT?7JPv1(KVXvJ51lUeGMxTxM#03yjO*-ti39oGMXKgFYG|ZHWn`?7TU%R;
zb+T7c<6GQF0PUgfUSEVM>yN-xrFu18uaD)`QBm@r7SfcT#g}~b+p@B<;);rP=pABZ
zbafxhB>rM4W^nC(&@|-b<qglyUYjYwuPDLJLuFxQ#hM4*2L}hghKGl<BRvN&q%&|I
zug+ZymmYxB&KE@nTb#EYRQ(_N!ZFP@{`l)B{`H;8;-7*%FYGUR_4oH14@7-3;2*^R
z01o6ZY8j4kVJ~ve?bQNE)aX?FC+qD?ZFdiBdJP9U{&|GRwy_|c1L|DlIn>d|G~;%U
zQ@x?nG{2QP3j<GfE)EW3p84;Jii&Jb<&I`%*LaL3>w;WdT+p2z^ZD%HM2nN<T2$VB
z`H#eqEvJyqw3HNlx8udi8DwNU=aiROZ-Q~Aq)YamIC7zq>2hs$IzqA6_#=OAF0KYt
zoIgDC&`97B-i*2`-)A#3Gtn}^e&GW-AD=cJ{+^xPUG>1HQ-0Di@tZaggYfbiv!OV9
z-fI0ibI8PWfy8N~x9JB)WX+shkZ-D}|D(p~-$M`RU7Lvi;||VsQ>At_m{(IxEs4%&
zQ<_k$F(e+9vrv?lcB}p`k`hW9O)fGiPKtNgnX{Xl8w2T6zE}v+$jFH336IqHRDk`s
z6U1*~rclOesgi<>Y%TWNO_+we<z%)lHE%PJr6D(=qNGe>7-?o^rVKv~RS@@@iO>O(
z+Gx9!1hQ_AjEr1a6WI<$#j`}e655TKab+Q}z311JA0)9zRm|#T$q-H)0TvIK$IqMA
zY5d5j0E04E2F?^=ybEC~#n&=%K_dA$2-4#jo;|Aq^!63L*-BY_6Zs@nBcr3elQ}}M
zM?9l<tE;P=?nVlhi@%DfLs5S{1@tEz?|;n^e7RVyGHefyj*d1_N0oN@cd?b%KQO?^
z{W~fuN_w*{0=*SgdR)pLi77qKLy!vdLT@>f<UP9pbi1!ml%7bFpYzb35QSeP(-pe)
zuN5z=EiEl){!e!=Tka(#CHIjg3r}rt%ELN1K;UaNczSj9QFy`k9R!@XczDH`YBeV(
zCq1ExYjp(+!2^SXdQNyT=~<l{9p2Ymun5^`eJYVIt;#9QF5^eR8zj<-@L<%;pnYzK
zYo_$Yf$><4AufLY`(m5_e0+SSY^p~oNycr;3ZSX1`h0OjoS*-kZPL)tbkEE<D=PVa
z2$_*EH0(@>9&e<$TcQc}FRT;k8Ak6lw@l13-?5@eCRlIxEM?ij!ky_8<>ug!ZLF<z
zj*N*pq5amQ1Nx-Op?c6G*h;60=5e(nXX~P)(R`VJxzinlSZD*bGBtH+J+qDca1-C&
z-hLE}jNYWm``=GbAwBiLt=_P<9hC$oU)k{q3`tcEu4vhts+ChDH!<J&U#e2k1gs>i
z(?Gjr6?{dFePiC(Z{z8l6u(G9-^pUpvHGy0qGG)2Df2zGwAq1lG^CY9MUo5MdGi>F
zgYguBk!4%NBqV#57B99rIl};H7!(SXz0uGNZo~M`(&6RhC1L@Da|gi84uPPN8&X`b
zr0*`!Z>`120PavU&88O?lwLh1#xt3S#m9dS=SCYmGs`^-TB%v=L;`2Or*}c{`ua*W
z&P{A>eH$hZBU6kw!)JyfH=5N{l5lFTs@hFM7n=D&Jq<jn96?h(&%i5|<(px8&sOsD
zcf1usj1DQP92prH`~U!e3cXLAD}EsL?o747V77p3cFRPy$N5I3%%5B)MDKS3;QYx(
z1nKPTe4H&-P{srbfB6RMhwNr%W*S7lbE3fIiik^lk=QdipW_CLA+rRt7R$;d6?u<5
z-PiwmkS3OE?B4kZZM;K&lXC>U^OPYKRB6<;0r{toBSpX}B>EN@&r7>+tKrIGZ+|)@
z$?hIiRzOTjDq5=3%#aj(Devd^Ttm!l`A==aaYP&gZ^8!rG_~G-WX_kMl~m|>j>IG0
z%@R4Xt6NibhIRC5e0J7Fbb+0XYFMGnR-2BFF2Z)nii0R;etsUPcI&o17+aWq^LJ&1
zyx_|ZEh-{89UUEQ*!8|@C&~=<>S9Ng-MYNHWxT@;((!LMU@SHVUZ1NMSV?sG&19i?
z-$;8-T?_-c5h5^GIyg=x=y3wDn#_LK%IJ}nmJa0c0Dh*XzGmd%X)v-SU}0u1kN)`+
z#$9&r<l^$krt{EdME}VXzm%3}Xr2fek4IFBt75==O;vu98o9(^RQ30HODJVLDK$zf
zOoWDJCqgI$1OipcK9IP^Z1qKK?zoUtigTDctSt2QnzC!2D}N+a&i-=w;_+6uP<}s?
z7|mkgYDq3bjWk{?+~i(b-{H98L34Uq@)+0dvOBu@yDkjhl|HcSQB_rSR!>iFJp3s6
z+{Dtd>FYc)H6aV$^$-k)TKd8uvVbbWhEc1%8a-?4Vyka6nT(7)XRZP1cpA8TbhP*_
z^!o^6LW;BUmbY>oPLS^1EqNNYr2c!KVI~oLvf5~i+-#<pC$ip-)7OUu1Oi7{#W>W}
z)q^&1%^V!gjD%YIILWR<Q;l<Ipn2R@DjX*H6jzb^hQ$~X^`vW>^6Ki`Wq$?>%F58h
z#Ka8Jo=-NrHtPz&3ICAetM~Es8jauS%fjf7pKjqE(#BB#jR_+o*CAl=WcC4(CSv=#
zF)XNTvoE>>ZE@c~&tx>K&gWh#Tgdaw#X%y=!-!pEld}5nd+D>XqAw^Z(HgB35qPVq
ztJC{SfJ`lo!t(Qew%Q-TqFgJMTCyMwI=$5Aj}tZ!BRhz?p?=F)b0h80DfEOJTh<j7
zg%)A3Bd@tPmDg2O;L6R(c?r|%3VeIrmBbouoWZMJ87gMe{$JJ8R$rKzn+wU}cU-&&
z|IoON-1a9N@9jls@lPGZhv^jQ&?eI<MOFEm{0X03;l`R#a;o9wak4TpF~R9cUrm($
zX%=u(FM&z^^zU+;+VgDfx3cDNCmd;6m(>&y+2Iyq7VnVnU{vPQ?s>lV*!>?03JPtR
zpm~Vp{B^gJOBkwVXQh6#mSdjuWb)ej`fcm~ywcOtzoew3z^_dP6_zH;3x#}ZCc7^o
zBtUf>owop~c?GmZjTC3o6M<%+dDCzcFyK0q^+Z<@O@UwE2fwx`4r0>Om$>`&Vl}1!
z<%yyF5D46-a%};E=;#^49#ynz@YZ!tDCDx3EH}?d?(D*rcwjkl#x_7cHg@*lBbI;}
z<|S%cujO3MbC?_3mn`t8H)O_kZ)*#JmpNeAt}#nsw~Fr@^D{w?okjg*H+c}I$zgh?
zwd?iPNF`lE>|5>aYB2nRsA13Os_tTIM-K0O_TYFl)dEz%cP~djh60E>_uzq|XOlp#
zUojp&U|$V*IOtxnQqR;*p}92%-qXJ#|41)GK_u$so0ONP0Ic;L>06~#?m$6^s@-Sd
zx{ceD!yNFqYh52Ls@A&SSu~CvY@@tLGN`ax`>QrvNidn;7ccCH2&Ivf^7xQL47_(4
zu4B_RjWGnrPLRn%@O4u8T*@I%0s~9PgeEIN;xO#GcpV6rlkyVvZ-1X7SZUsumX68k
z#!dckR4Pih?b{6B`<#}Xj-^(}W(g{ui)MT((U$s@^6`BL$#cmnM)@{&>z+LG^9tna
zV@i`16bpGk@$x^iP~t?JxU)GZ@CF3>VPH{A92NKP$<)m1a))pvP4pYZ@Pjm-xi)5S
zD$1V_o#egk!&LESr=6yNoRd0*lmR=YcL#S5FI#<&L=%?%ELS69g29OcUs&1?$Pn>>
z;>0AYt8B*d3h<)AwT(Oo?-pb1P5%VHOM*geNv!dK;iy<*SeS){?z)JYx_-A{G?$Bj
zZD~+U3Bb5VhMn#_5#e1Ic#BcRpPuHRFSQ*Bbw+(2*6ciUT2?V|r)DBkocy7A>#HNF
zT^AHU>_~m3OU;q=+?OG|5_A?2vB@1F56Xvi!`r{xyUhE`ejh!9AH&jzSXbp;N+@qe
zbEsZBXChFa^-LJxTg`=zE;@b@MWh-QHv6tIjOR0_d#Gq_jL0A(awOeQ?kgw`oJl>8
z4jj!zKPdZk&`E0`JviF*#IOlhol)NZOLsrD9{pY6>BX5`WkAS&RL{#B_3$oJ{3y1Y
z8|)-f#jzCkimN8V(zkuXzr9i6il&WDEF2ojs(qxTGt2NBlcM8ubLY<g^@~|rGqhD*
zh0m_$t?z^5@X2Yi)}Ghf?a||%kR(Y0GpAT}e}6hHpjAgcDsMwbU`uM3fKx+}-GKe{
z4vOA9@TV}OZsRpa)jTQ@R=VFNcVjSUCpIi)Nj^q6E)=P1FQ#MQeWLD}^VvIjZ=N~+
z+@b41{14}lESoH_P1sHVOkFOt@8Zf$8SaX3*!su8(kunTu8B;#2^lA8D3$x;Sb#dU
zHsMbh?$#9l?}*b3tshG%Qkz5^$?Xqp;M&bR@|4*X9j_VvT)r3zI_7fP=0|n!e2yD<
z#Rm!#=-Z+1c<t#^)1LD*1zVwwZ3VoB4=z$$=($=b#l+R~B}gslqS*D?nMS@XeXDnQ
zZ=3(vZHISOh;;s^;==i9r;O<%&>)1h5!scY(y7W!Eue6z;gfj5&FjCH+9D0!;Dr=q
z!hP=hq0=R6SC@y!QP=U3aC`-K+;oG1B=Um(Q5%Y;X})m(m=~i*HXqSpO?5h7rQpum
zcC6Zb`=YxskCXInHO&!%bRFKM_EeVEkn1YGaEX{cK5G6xCWm(|6+~#LgWK^1#KAn>
zvT&!z$Ow`T$aRh)8uTalWw2w<AXw-a5`i+hkm{uD-kb*&cvX;aSzyBh(LdKynfBHC
zR-ZLyzRZsBe&4;j>(V$!7#Nb~HQ){}l;&Diu*x^Ex5@Rmp601{ofEnKymXHg8U1k_
zGrRBcdNNO6{}Ex~s#rlLH8ZQ2TSx)Tpu(m#24gv|%4jIYL?1T)qTZI=N&jgkvD|~$
zRf~e<h2>nJUvL}}9gXKG$N6iyMYYuYs;I`4`0;6w{|n1J*<?WAtFVLNMr!16>~sz}
zM|rwYs}12*+X^gSYU;Ja*UxHxjzKDs9F30N^R*`MO}r`9QnuDky8v=~D_#e`-<g&M
z-_*i4m};y4H3=164DGH<G7_kh*X+~&*=}H_9&0j=Dm-58=S2o{Jh?iv(e<(F<S@?E
zfe3v@njIBqn(xEmAZAKAYp*evxyRsHhuEFqyB1cWctNIYNltOzS^K18?2&I`VlubB
zj9Md8;qv6M;3D+5l6KIHqUQ1TH*T3mBOk_Y42gG0s}q$2(|jsbwN+(nhh^ID_7N)+
zc`fxp-<XiRXDi_qvfDi4ee?a>((`PsIHnlfbSI}{t);7n>mQ@!WT~k!{4ZG`m0gi?
zPvvj8ziqU>xuu5Ig<WrVuMj&TivNKn!fGdGJs%@V5-PryQH)Pzi0WfEbT@&Wg@tK!
zQJP1z2!(`nQ=6LX1`g*6nc{%pkqlvP+M(X@SZ*J47Tf$$1sCP$68s}07x&~hH9o6F
z2V<Crmn`{L`W#>*i`yY-nT1*}TincD;Jl|pak)0R36>UOUCra&hmvf?dbxi0t*WxC
z_E9`~EfWRt78jPw^c1rOv!a@P3wQ1CFa2NA7nqkZ%Bg?SX`DW2K~_?B;u90~mV*<d
zo%s$cDl?`U_?4)LTK^=b$6Gf^_UIr!iiPE@fA#CY?&Z!n=UP}aG$gd#v1HKbDe+Pc
zxD8f+Q_3epN1wq}{E3*N$f5KwG=iF^7IKli_W`oG9hg^l0Sn&Wsbeq!+$mfnjfYQ$
zR2BqCy7^STRx{t7t)os(;x3D02Vtk;ExP;Ocsykg22|lU81ohIZD696h%~Gqo86x2
z>WVn#%2+6l|7V92snYTUt7<cAC@c-DmI}*9qV8X391VWQJCpq2fzRu9gABPo+$>F~
z=tqh+YM+R-#ym{{QEUIJy~%nxt4dOQyL|a%^g*=~Fxb=_s%c{tam`ZX9XS@Q4hGuP
zTY{k-2#8CZ!svVxR!rHgzLqKy=Y9CLo<+Zt2rFLw(dE-#VCoM~=OGuQ(vk>V=q;=^
zS-aI~+5<{AnJTNxQvIm`bLi;u=xzMv#^kHX%E`~Yi}Nwe_4WD^XFWli44>-^Mq7)n
z{w{0=<dAaEdt{ed>-yKRe$>leOE*I^;80`oZdE4h<5V6aWD~x)%#L6SaFvaw-qRib
z?(h7hHPOm3=I;O{`^XvdtRu88Iv2QCFh~|rDIlEUSWr|v><>`*Vuo2Lpk7+_NQ57%
zMpelo&<mjG<TI^2txG7*bw#ig6?WMl9vqzC)=BSzSsbc4%UqVh&eoX}6k`>ZGy8<c
z?CkHgd|ETMz|R12v4<lgquR%N>byK;JEhp8-kG_eB*=DwY(<W!f_;7<q%}j-Dtn|!
tjk})sM^8^Or_KM{{`cJxYt$RcN;2cz$ca7e`=%RCPU@><mAG;6{{haqQd$52

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 4cd8e7161332b9b80fd3e723d63b09c82eb7ee24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7613
zcmV;u9YW%XP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0013?Nkl<Zc-rk<
z2Ut}{_77FT-n*!%XzXi?h3Li-%WBM~M^{ZYCi_n`Mz<If+vYR+Pj*ez#0ZLry({(#
zmZ%`82!hh3DCNPU*Z1D#>^bvhZtjEEL{Y@t?>pavcjw+a^E)%YQ)cGA7hd@N`2DbS
z0DujOEf+frBFfqPj$GvdCjjla*ge91>=gI0{T*5JJ)FRDFb6oEb4F>7;)3Fa(u0c|
z|BlW%TTqAt|NMP~D0-+(x$hlOx}*FVWf6)GiXX~tlw_1Flme6@E(QF%BwogkU$cnc
zgYM;MMCp$-!k%T|D>NMcZ;kQ}iU&#vN<Ipdm6gdNNs`r~ypG@NCcig5qqVV)@VxYR
zJH`L?P~Je<iIS!STmhyIMXL}Um-2_sMA-^T;m_L1pIy&X{c1AsoluscL>U2H32>RD
z(}Gm21}QrVq_hB#lFot@?+a4QUX(pt@b9=oc<u~HsaHYDx(iZK2C!@C9)=1kuZ$>O
zmrgZK5rStG|GT36gpw_Q=KyIqMrD$w0Hpi}AU(JUQpkTmI{OYtzQaM<-5sQ@twHi`
z0MZ6WkUVTqUieKmIN-VZSf&-0bpz?pP>@dl8KfKEqGHa0l$Q)rX+A1NClsRL&lZZv
z=5=!|N0m0uEYB<cZiKQNB}W0gpbG>+r|;q69w7O>57M@FAbHvu0{kfAX^V<!3DTK2
zKnh(0Qf8QPbjVc26_La1+Q?X2o|Rtjp!ok?lsE<O6}VZ-jR$E*N02twdVHXp5*jI6
znuBy|3P@2qaI_`Us8DtYp$Mw;dx~~ARQu5&B31r(3zXdo;5p40@mflec8-jwdhpB3
zMkhU0g|7#xAXO+r&=c^3+R#E_8*Hnsp;i1nf&1$MWY)8aH99EL=#03HIz9btto`Jb
zzy$5duC97TknvX3nU4mFFD4jkYqjHhtn}h?y}nF?J<C5i2i`gp4c>RsL8mh^3UcBQ
zgf34>0bIOrL>&1eNcWC{q%D>m1mQ7hwb~`vM4M`57eqy<S72qg3h;G09qU24C0bZ@
zD+QYS+yEPoYtUz37-SV|Dk^}C;)PjHR{=uE)4H|@M?)s7n`jHQOQX?jJAeMXeYH@6
zFt!xTVC7D8$`MXC1f}J}h{Jan@Jd;6;{j-NMyQBfPw$52se)+Arzv_$ZBW|k#RrY*
zrn(hf(?^y4e*o#ezwns!fr(xTXX4`G8YnS%nmxZERw|H#&)iDl`NQ#Q=(6(`*m+*7
zpn&eXLm@PyprQhbR3IH2%ME00z3aGt07(AR^)UejU@5<Xq`HBw<ZY1D;d)Ws)CXV*
z$3eQi4y22J)5i|m+as;ic?8AS=oKBgMIS?Ox0RGoT3UK7IXSuUQyB^3ff*SY)bj%f
zd@)S5*t1uMrplCKOh_qnFDHP`m@&S)Ss#2wpix#`=MC3AR33<lrU+w;Xpo|JBDH<2
zcXJ<!l9mX&z}iYmC@LxnL^^8tM3ta$GwrYvr<C9m-!BYIf;wKoCczid3>9=aCD({8
zK>MIAsT}C0L|dxo^Qi40oty;H=0=rpSusYr_=)T#i8klw=b!QP^mKS4-jUJ=#)ofF
z(oSBf7M2DjTLr!t1t0pyL7_(b_<*)XD6f=w3Z&!X&~DUw$RN%Uq)VR(<Ba{U3<tap
zva_?dE4(AyD)0U1jxACcT;^sjx@JB2BptSgz%RGcOvD9GKs1FQ#T^9cz(9Sf!s?OW
zs2>U3O~pe(qYSC3smrQ#6bNgN;Ez-I`BJe~2S10ULR~AtciI>XGqC61&MY+U2|ZEK
z=_BBPFZJn(hoPgOrTPe-dq!vvAU-~Ra+P>S!oU<16tuvHB?&*DjOg)%ENHRihE?D<
zMc)5^bU|}UG*20LBL+ME2shMLdQ6mgjoivyRK!9@m>?A;2L=YVeXK^AC)bGIZ16d|
zlt%ZaDj&M-3bhJ+ay?HaW>+uZ%ZvIBy1`?RlB`q$#URQ4a_RyPqN4qXm8}A|$J6`K
z?|ny++bPROqdWH4U88<}d1KpaPZ;z2wK}PKD?p?~C?#%{T|h<c?=Kr=!l$sX5Tc@@
zrazWZAPh=YR#pQXVlkY0bmZ%k0k!qC-1GbF4TGTc{OS+9K|qME=819E8|NT>j3B5;
ztyae!J$kh1BO7IYu?_bAZ#ea^JpR?xJZQ7+rbY03BluyN1<w}vLJHGBI{k)qHh}^)
zio*5zB3(&I3B<<6eoxp{S^?t1oSd9ac+)K2`=tV;o_Eg1SOmY-)|)H?`b^M{Nt+M>
z(xD;NDdFfS7Gn@b)LC&9WM8~^u{&WXl6RHiejD_0S1WtJZ@d~BdS5pSe!We>@DsYG
z&n)mtH<fZsl>D=p%60}RVuOg_#VGLLqrkpWh8Hb*2kiNoqW9;b`{;fs!ea0L{MUOx
zBjwpwfS4@$g=bqWC}DRuq%IZ1iZIK}%v7T-=tfvxzkc1}p}D`fxOlN5;)SF4vcO?O
zkXi71A@9fL6x9&$73m8~5L)9EMQmhBBiJZ7i-?F=@lduv<T8-A>f*yAgy%z(D3eb{
znFXIx5j&zXjAS`$fMkT~)8m$u;Omaj^#hr*Q&LhQmn~b?*y=oy;QqY4yeUe*-wzFH
zQy=pY@5B?4PcOGq)j}CnN<VC{w`>by_K*TtT!1*jwQJYjx5^eMqBmQlpY6)2#V;-=
zfUOzu$uJ*5imH*|E0@pEB#)(0aP}>+!a_@ly6EWWeTb=@#pqZJ5#+6wc=3H<eA5d{
zq4UmLW_$k|r=zQ1j;AUlXqjcVbPG~dR+Q|LrlqB&tY5#r17W*&?_N7g8BZJZVc%5J
z&%rpg*=(mhM#MA)S>wScq3KUcvul(s4fg<=I1@B<`SRr%ge`V%M@!z1ZDC>II??+}
zwL19wl?1anpRT(?jjwd5i9+)T=cZbwA-}2mvUrr1mXbH*&69L?X6dJY|NaihTfssB
znME2Hcp%(tvhC}@BsLfPTquAf;e_Qp(RLT~hEhQ93`vlXkPy<kb!%snG$g#A$jC@H
zyday;drFa6g)Fi)rGQ48uUG#x^JC8wsq`zg%}!sUx0HHWwgW1aDrd)z9eoL7qd}Qa
z0Q#-3EBIeJfc$UH`{}kj6jBOGo-YN^bmW;gEz?lgT81IvnVXvnetv#`G3ky9{?E$F
zS}3L)$p90*nDc&Ux#2UNaI0*3;?^qtO6&3~uYH<;w98E&kkMLG{X7ASii3lLmm9SM
z3jfp|E%v70^8OOMi2$2Z08KF#6cj*GQj#p0nVCi_PQ9RfIh_&Pk)NM$P%b$++2H?&
z5ggI%IaEhefKuWNJwH~~(*4M<XV=kAo&Ejv3&1XX1X9TNAjR%O+PR|Np;MTSMz~l`
zQIjDK3k%zU7&}ym2NWT)BYHq*l<5a|U(?Aq$_pLC;42^?09;&Lphb%oOr}nq%4UYj
zH}sotzLCq2y#N0D%tb3-?&qI>hE}awu`={IeE4vK>mEkhw{H*q`t^f%-+dR39z9y2
zUU%=_g)hGN0tOEr4DH&rvv@yJf}Vy-#A-Qfgy00UuNM$w=L%^F{*TRDZ@pC)d&4bm
zfOYqBi`k@#DFrmyd;@~h^I7le*|R6mtw=g`>I5MnAqJJm&d!FRLx;*`NE$b8OetG~
za#Ya~BSy$&+O};AGiS~;xURBNzkYpKvSbPC@${^ys3_>ws~6bX+FE^&d-v`=G-Zjr
z5PCx4Lxv2YypWB7CnU0;8#iujfkP}_Ty#6LfUWN|r2tnvM_v+@U$9^S*x1;xO4h1X
z3pQ`wY)}adM4)BMmK7SbWy=<Wa`*4w2WMwz`TT?l6JYuB<p$T#{p-}JBa5S>qrrLl
zU!1F5yS7{}5_APAH^ZK_bm`Ix*O8LM$TKGL2(U&ty|V648zz#I6X(vI+rC0}R4Cxk
zp+l}%HchyoL1}r=Zd-^+1@zl@8xnH$Ja_*5d1&6ex!jo7Uw_@8GAmcEG}_asTye3y
z<`S?I7@YU;@PM^z*UJCf+uOr;-+f1GaAf)SzyED;e(~bP?E9FQ81VP^htZ=)8=POY
zY84v=W5$dz0DtS&t&o$G!_E<B8xv)lG~wY;a_%e?A3p}gzK5V_&u%E%x&?|hZGysI
z)<NM<Ye5?qC%dAlsi~@Ozx}qSDFxV`J$tr07M5cGn){`xMN<lR>0mhA&({xUGIS$H
zj+7fjy&WGY1MBYYE}v`GteLEgu3fuQl*r1FJ$U==w+$#G4jWKj0bX8S20;Au(@zHH
zfB4}C1LMAL-#+<yG#cj5pU<A9q&g=jCpJo{Gmrv=lm}fYd9y!-j3$jCqfrCMXiyI_
z>N-P)b8S%7b_A7!9b`1D4<)Bg$qGnMPtQU7_J<0dkWj$MlP7!Qjq`*8uB7CeRR9_2
z)PhnOWYn%fk2-MR06UkKmd0p9ocr?2FQIAErZS!E+_{sLLn8&9J9n1LjU79d8O=vk
z00C=fXD64LJ$p6-di?nD@^_>dGS(k_@Bz%4HA|LHKm8O|tXKh8u3VuVGKOB=hciKC
z`+`X!WfUJhq726JQ2~QZDZmcBgg#0ISQ-IC6eB=*6!q%WlN<Eczy6g0=;`SxH?%{C
z4vZR<BZ7K8T~8DsfFi}vbp+(2D&XqXs}&SL?&O*^YYgmzIdO1sfEhDp0LDqbDPZPw
z^9ra}7fMc^G*AGx<t3h)uBd?h`}g-yQcxh;fHr0n(0~7JNX#oX@bkxw8z)zqJR|DW
z<N^w%Oq({1t)rw-Aj-9A(}pU?+)}0Y6OJ59_pK@g5JgU(KAk<E=#FSeDbxv+3L+&?
zrx5qedGihP3P4&aIdj^8g3x{qFsXnI8#Z*sVI~{lTNwq=X~!+IX^5EYA_Et4_3G8E
zqN2j&(|768h5b(+34urDE?&IIz!G$|ZrwV$90@5>1U*%y01<?RhK9nCBS&DzjvWT#
z?d=VpefF8$9^sWSrvd3Gd-N-26_DAy8I)o>g#s|pQ=zxm$D{)O^{;=m#R}aMt`kkJ
z_uOMT4rsCECWMsRYDB)Z(%p1*b(I@Wfez6Wm7^Ztw{Ks0WKh6F3Znn1ypNBMe9x*>
zfF&UXz4+pb^0ny4v#42z-jcdsAM*<6-~y#LZpdyZ#t?}ZYjq~94b}?rK+LvBj~<PY
zv*kccRalBVA7OT>`MD&+Oeh&D>Ltc_l#HryIjLcD=FBn5!DJ_dXH=C6Aj%{M!ITh1
zUAlCMd2Qm_QKLpNyQYnggUpUDW)-0B*#k7OF=7`!*}iaWTT8;ad?3c=fl=zCAADA%
zB4{#Z;tBIBA=ZbdRp>PogeixukRN~i(V*Pn!-rY0RK6V949W*pr2@#kq^OuuD5iu)
ztQeI-7A;!D?p=cMMMl%cW)+a-J`8kfwVa9w3k#!E1VzHO%a$!ONJZG-7c?a5qM_I<
z6hM`qcR9hV0zNz+S3v=H?%aWH-MSf6yh)QLas(<QBO?PkcI;?Sjz$FWud-ZKDS$q$
zO+iq-h%zZIp$NBd-OqY|-;4rs-+3E!IMPHiE-)}~H{PorVO?Qzo=*}u<1ksGc#TY%
zS46s51<-66ZO&5yLPPZ9k3VLSv5<)qC$eE(URmU8E6Wl6kbO{=A;86XN+pz6Q2Fx|
zJu4Lu930Hj2%^lwg$o%4(Wmm+ri8qtDO0Af`>^{Wn7JQ)2r4@pvkEA{2%RraDWiND
z##yvr*V*WV4F9tBufP8Kp5o<6(oIzX)Y=$i)(}&?P##!P0vRhIN=i`*xunW+l(Z{f
zhU|toPky+tBgXDQ=jnfglmUWG--|LLHBFz&XPXj=nw1LGWoJQV=T2t9SJ~S_$>~$_
zgbcL{sd*M*jQsCtYDUZvgOmPfNY%m>r6nn}yTz0O95)2Pe?lHSSCcZt|CDMl>jAZF
z4%);-*#*6S|9<wodGp)}V^dR-#7T6b8EQOOD1f$+PW6j5OGBfM-i0EK_BmM<p@F=)
zpPTRfDA{AjFjrMf%HO_yI~1{PLl_$vVC8|vt`>eYN=!`j6sscWVxPMz=5m@F1r#+u
z4+_wrd#rZrYF+`3_E7NscPv<=ZLCC@etv#58`g+pZ2UNJ;sl+nd+yx1845d47LCzv
z8#8HXlG&H;0c}~W=?W<L?|&G;W>XO8o|Xm%$m>JNj(B={&L(Wp4%9ZO03IATO`SUR
zMKokdf`*9S|9sl~+;GPoAwUMZCWEg-?@Zm}MT_)9{y%nmng64sqaVEb>Z_E7cH-{7
z>0|u(@iYpWCnO~7Qoa*mf2`W<PIy|nGV6SN%{9iz{RQ8x1XV2u^9sQ8h3nTduZdn|
zK=kA9@9&G4w&2*BKTt#DA~p2&^_{M8y~>jEN?@pk-7&Ob+n7sQBe*|08q{4}E%ttO
z&lf?1fvBJ#3N}}-Ui~RyYL@@Y(U3ES;jYMC5h5={n=aOdrJ7X$je<X&jD+kOwn|!u
z@j~7wA6o>UB>(G$Y_y2{PiSap6b6B`S<l%b{fGmjSXw&KJSZq=rS7*k36`Z{OyIWL
z{LXk<s<I|D1xjm>L8dugns&4VerBr{ppA<ay<ejF<$e41ttBiurq&&thU!nBK7A0z
z1Zl!0C4Q%%tM<kqiw61PgWQ@yJxC`Oqh1mW%<}*F57zq?##c3Y^5mBZ%Q<uA)OwhW
zl5C9-ezv}G<Aw*H3uQ3@rKpEmu~Tw124~OuD9|P(K-S0+7IQv=`?c}$!uU#*zCb&=
zg)rn;KHPgFxW*byn>KAI4yANuV0JJr6B?M<D@@DPhx<mbP1?`$W<70cD&$U^YBA*?
zCf^G;c(N?1=>1VqQ5o3#|410loH?_0Wj4#(3>!9#UhUrY(xpqQ_-ZmqyqfF-|2U)I
z(?-3>tY>_iYH11N&YS@m7Shc^awbgz9eO*W_fz6+*REZ^5Oy5H%DpuOhYs0-#^@3C
zOioUYRK^9WA~eXmZW(OS`zkQW=qt#yIxXZDKN~hdo00;#Gp1VwJTts)T7mYr<&|vW
z1!+6R#l?jJuf|sS{^mvj4kOZF8!s=fPbsCW+_=3jHj^z|X^pb^t_t#v?2a$dmcXGq
zhv3UI3m{G%hqP2p?E(U)iHU}sx8Afk(IQh%<AzY^v0f}l5EJjTa_{ei8G>KG(!F1C
z*tc!lmZs5M(JehdR75j8^iVRgl&JGd&Nlu!Vw5v6XJC}iD=@&LKTJRP7r6Q0X7y77
zf={`dtU&`<9^b0okA^vK-WM!J;MAj|4tf+1!ir<|Sl*gtGilN!@?l%{?b~-?LPA13
zj}7>HLM5Zdmdad+zW}dp9m~KMGSYhlYzx^6>cY(G5oBd%K*7ot%!jv@c1TIN@4v@#
zLjnu>ym|9xLa$!Eh7eXGM~<xfIC{T0Y=;jYPCsbSe&x!QGcml@D!n3O;NMBV1F!9z
zYyiHHVO~RF&ha@Ak`e;Nn&PJed|@G!UbzA}f10RY&-oDGXAK_)+Qb9{>WPn!*DhGF
z;1j}#WA)hIp6JlKckkx-+4<nXgWr>-SK0%mL}x_9v;$L(g0GYjI2ykH^?QiSh<t+k
zyR@LW9mY}%8BH2l54<ANNx_*Ce46X__V!*)*l>)h<bBdM$ZJk@>eQiiE#3V6{dZHa
zK|0Xsf0u<-N?oXiS%*J@ft~{_Du85==Rg>{WelvmxB`Oj2SZL#PL*&xEf1k(g1NIk
zg3Q(}t>=10q?`T9NYK#2GQGdg(hZdB-@kwV0m6i^;agFw?3XrdJ9q9}pHHpz3J3@|
zLlfI%fP@mVi?ZR%vkTy*4TG&xfKo<p84a_K&xS)02O%jZ35rUKm<wAuU%nI#WIpSy
zg+KlP+2hACuf>|E)+qR6Mzf5l0H4}S3%gF8I^~a8^d?L=HdX!$8+K@Dm_2ZCaOfKx
z9DKFB63FNG4Dy8GUc(+*2}0aA4TleXKY+DY*T9LW6HKuc=|lsP27#u@k1RFooh5$f
zpa`SVyw5&`td|BshEuJF2fSQ<KY#A$pyNww1o$-i{rvo{AqM>k3y#SX`DG2Zo3dZO
ze$DW+gR`@9|G>b&06|B>CKPFk;P9QpFlFa!FwkQ_r4>Qfj@$Ms#An4D8c|v<^7(AY
ze%T$e`u78M*DjFRzAc*$d}Po?kmb@23Vv7x*wvMsFY!IUK~7Fig9rnTg?&|0k1-_(
zquddt--Qbo&I-d!6(vuI{QX-gx8VPd{;kpqAep>l666#c+6HY}DrApve=I;7HMWBX
zLCM)O%xLQrIUeHt<HwH^?a(swjtZmu#D8Il9_ZM!XHWWtA^H`%J||9`*qff7F1#bH
zm{B7h-*Ia@yuNEnr4;bDqn}g=-n1zXAZysr#}0g^OM56-wuE+8%Puvwh41mA{5~06
zdgVYT-gd{Q0lt9}(D*dtBcYd%kI#QGSkq|unn+2XAOVd|!`#gk=<ST&GRkT%iDc!a
zl@)U~$;sGD2R<I)(J&KrQTDSmAV5s0i<j@Q{7!6atj5E`gIvvC)K=c+rwYCS9kprG
zrb&Ya4M+(+zWVB`k1#5XC$2O$8iMWz!BYRF@bV^it8BpDusuc;kfcu?JR<lMgi-#d
z<oGd=`2JyKuctO#yLRo~{Q2`K$m&6Dq_#dS+A*tyMvWRZ=zs_Q-MwqquEUQVJLdb~
z!2{r<fu#zCA}C20tB!@$S69P(``(2i8(%W+4S5ZRD~VSsDj+@{vikI@9Pp0zYyyRL
zIhN9bTLs<l*AKH%ORq>caNxj^E?v6NtX6kwTSGjm8~92kkQ-LV)z!5fes&@Mc=__>
z^RHjO9!c9+`R{Q_+(?({6MChPoRiF4O^P2TZlB0NrvQx<Fk#zxxU0HrQ~~PVJ*`e3
zWYlqj%yw-d=e5aDw8;xJk&%pQgloy^h8bF_EB5-RWy_ZRgZubhc$@0*HdgDOG^9YJ
zcE^q#TQqOpoPL?~#m0>rzqEDh)}O<}!_&x9;=fK;#`EWr7!_n_GYc}oKh7W42d#&B
zC%=Gyp8f}<=ciYktBr{Pb$2(DoKF5b8Px0v;~;<G0w~_QhuIB@Z#5MhFX><Mss9zv
zoE%!inda^7{R`EZ>P~H-wosd%M3D7ZDTy{Cbn4WpJs%Cd+}+(@-MxGFW>iEf^)i}k
z=D)_F<@8jhv=s%V1uUpD77f#sVcz_CkURB#$o=p`7I@_^TMC8ie?dM!&LUtc!+dzY
zAB=-u#%V^&U1sK5Qk{0~+T}BB*s$^3(01W<uUB0u$689N-LhrNW-cx+WT4$>NDm%7
zcr5m^H8{*8$VTu;S|~%}o|E`2<G?-4%Q0lImG=@9Bi{2*ZY9-W)22;p2M!!Kj?;}B
z)s^bZd%fMW2!4ggnfMcja|<-iowy=;VHiJX(V|6jeSLiog@%SE5+F3GAx4Hc2srN2
z>dGC$p8WO&{VFt;Re~*gIw_js6ns_!J(He|br{Thyc^Yx>d3j?{#gg!m~Eh;T!%Q7
zdrL%3JrIOGZf<UWT)cSkd<=B9U%h(u2CXVcOG{%D+|*lXj}@PJ0#gT{qhMYa?UEr*
zSE*D|OiYX_ARyod-J704&!T72v#AbL7tZr_cpYtDsKJL&gfscmC~eWV7Nepk0fRDd
z?AWoBFrJv}<>j^N@ZrOI&f^gr92|mN9UB=L`5-PXE<G_ZF_VP;Muk0~b5!QSg$w78
z967QZsb$sIUw{2M-HYzYL8rHsxY0A|+1#ghejb1~Wh2<01mavWdbB2$CN?O)&cW(U
zSy#$B5?$c=mj?_OFy@t4UYUf)Yb5kHeTV1VsSGdMmveegey`4SZ+Zsj_qzPqb~TM^
zDx(Nn&bb6g9qgTrXhSpk-b4?4gt&6ba^rxKbXQ0>evZnx(lvA~zeh{DC#RTN{8_fo
zJMh*hgmNuT1RO=#w9=q;>())V4QZ(q`i{;~87j-ccH;N=9q>m~h){|xrwls|s#3)F
fwhFMTJ>dTXEu+vRJ>GR;00000NkvXXu0mjf)`F&z

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..fd26a79233e82d5bcdd31600ee586d6d120939b1
GIT binary patch
literal 5628
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
WzezUpAraFwAnhJryIs?m_hlG!_XXVm

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 3c6949bc93126b69e8c33bb848694c342482734b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7019
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
Du7!tI

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..4534f36553c547c2cb2172a18390a6dec928e47f
GIT binary patch
literal 4530
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
QW5-5R5%jSPWaBBx03*tyS^xk5

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index e3fa253ee4c28cc27adcd4969afe307d9f3ae0c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12779
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

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 488aa1036289eee2d69fdb274711f90d5a862531..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11857
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
LNkvXXu0mjfj1K(#

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..875eb4c99a9796942a83da9b5809a294afdf7e4c
GIT binary patch
literal 8312
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
CzqcF!

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 8e638e327beea23a0ec001aff9cef5f2bd714d88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9591
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
Nl-{Vz)yhD_{|B`)0)zkn

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..af06cbd20bbeb026147f0fec7c06f138502c5bd2
GIT binary patch
literal 6190
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
MrzQikjku5j0O5Nc8vp<R

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 7106807bb97e50a0714dd1c39c4435cfcbc77c77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18511
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
FngFPk-=_co

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 374091fc68ae0f09e35ec9ae01fce51aa8e3cd01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16843
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
LNkvXXu0mjfL%Y~8

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..64c524bcaf8e2770daa69a55c59ccf3e6941b4aa
GIT binary patch
literal 11292
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
SQY7lh3?Zl|NbV<;IR*gr_iP9N

literal 0
HcmV?d00001


From 5265b949af85116cf8e84adbaa276d20510bc967 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 16 Jan 2025 16:56:40 +0100
Subject: [PATCH 078/103] Eliminato vecchio dialog di richiesta stampa
 (sostituito con DialogYesNo)

---
 .../picking_resi/PickingResiActivity.java     | 21 +++++----
 .../gest/spedizione/SpedizioneActivity.java   |  9 ++--
 .../DialogAskShouldPrint.java                 | 47 -------------------
 .../view/dialogs/yes_no/DialogYesNoView.java  |  5 +-
 app/src/main/res/values-it/strings.xml        |  2 +-
 5 files changed, 23 insertions(+), 61 deletions(-)
 delete mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_print/DialogAskShouldPrint.java

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
index d41252ba..5a6bd055 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
@@ -50,11 +50,12 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGExcep
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
-import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint;
+import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
+import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
 
 public class PickingResiActivity extends BaseActivity implements BottomSheetFragmentLUContentView.Listener, BottomSheetFragmentLUContentViewModel.Listener, PickingResiViewModel.Listener {
 
@@ -392,18 +393,22 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
 
     @Override
     public void onLUPrintRequest(RunnableArgs<Boolean> onComplete) {
-        DialogAskShouldPrint.make(this, "Packing List", onComplete).show();
+        DialogYesNoView.newInstance(getString(R.string.action_print),
+                        String.format(getString(R.string.message_print_packing_list), "Packing List"),
+                        result -> {
+                            onComplete.run(result == DialogConsts.Results.YES);
+                        })
+                .show(getSupportFragmentManager(), "dialog-print");
     }
 
     @Override
     public void onLUPrintError(Exception ex, Runnable onComplete) {
         this.onLoadingEnded();
-        DialogSimpleMessageView.makeErrorDialog(
-                new SpannableString(ex.getMessage()),
-                null,
-                null,
-                R.string.button_ignore_print,
-                onComplete)
+        DialogSimpleMessageView.makeErrorDialog(new SpannableString(ex.getMessage()),
+                        null,
+                        null,
+                        R.string.button_ignore_print,
+                        onComplete)
                 .show(getSupportFragmentManager(), "tag");
     }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index 2ca1a6a5..b001f6de 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -70,7 +70,6 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUView;
-import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint;
 import it.integry.integrywmsnative.view.dialogs.ask_vettore.DialogAskVettoreView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
@@ -81,7 +80,6 @@ import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAgg
 import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowQtaTotOrderedQuantityException;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtView;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiView;
 import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
@@ -818,7 +816,12 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onLUPrintRequest(RunnableArgs<Boolean> onComplete) {
-        DialogAskShouldPrint.make(this, "Packing List", onComplete).show();
+        DialogYesNoView.newInstance(getString(R.string.action_print),
+                        String.format(getString(R.string.message_print_packing_list), "Packing List"),
+                        result -> {
+                            onComplete.run(result == DialogConsts.Results.YES);
+                        })
+                .show(getSupportFragmentManager(), "dialog-print");
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_print/DialogAskShouldPrint.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_print/DialogAskShouldPrint.java
deleted file mode 100644
index b5753990..00000000
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_print/DialogAskShouldPrint.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package it.integry.integrywmsnative.view.dialogs.ask_should_print;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.view.LayoutInflater;
-
-import androidx.databinding.DataBindingUtil;
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.databinding.DialogAskShouldPrintBinding;
-
-public class DialogAskShouldPrint {
-
-    private Dialog currentDialog;
-
-    public static Dialog make(final Context context, final String nomeEtichettaEN, RunnableArgs<Boolean> onDialogDismiss) {
-        return new DialogAskShouldPrint(context, nomeEtichettaEN, onDialogDismiss).currentDialog;
-    }
-
-    private DialogAskShouldPrint(Context context, String nomeEtichettaEN, RunnableArgs<Boolean> onDialogDismiss) {
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
-        DialogAskShouldPrintBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_ask_should_print, null, false);
-
-        currentDialog = new Dialog(context);
-        currentDialog.setContentView(bindings.getRoot());
-
-        currentDialog.setCanceledOnTouchOutside(false);
-        currentDialog.setCancelable(false);
-        currentDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-
-        bindings.descriptionText.setText(String.format(context.getResources().getString(R.string.message_print_packing_list), nomeEtichettaEN));
-
-        bindings.buttonConfirm.setOnClickListener(v -> {
-            currentDialog.dismiss();
-            onDialogDismiss.run(true);
-        });
-
-        bindings.buttonAbort.setOnClickListener(v -> {
-            currentDialog.dismiss();
-            onDialogDismiss.run(false);
-        });
-
-    }
-
-}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java
index 7151f400..a6fa284e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java
@@ -11,6 +11,7 @@ import androidx.fragment.app.DialogFragment;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
+import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.DialogYesNoBinding;
@@ -56,10 +57,10 @@ public class DialogYesNoView extends DialogFragment {
         var alertDialog = new MaterialAlertDialogBuilder(requireContext())
                 .setView(binding.getRoot())
                 .setCancelable(false)
-                .setPositiveButton("Ok", (dialog, which) -> {
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
                     if (onDialogDismiss != null) onDialogDismiss.run(DialogConsts.Results.YES);
                 })
-                .setNegativeButton("Annulla", (dialog, which) -> {
+                .setNegativeButton(R.string.no, (dialog, which) -> {
                     if (onDialogDismiss != null) onDialogDismiss.run(DialogConsts.Results.NO);
                 })
                 .create();
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index fc677fbe..b65ea13f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -313,7 +313,7 @@
     <string name="no">No</string>
 
     <string name="placement">Posizionamento</string>
-    <string name="message_print_packing_list">Vuoi procedere con la stampa di una %s</string>
+    <string name="message_print_packing_list">Vuoi procedere con la stampa di una %s?</string>
     <string name="message_print_packing_list_on_close_order">Vuoi stampare le packing list degli ordini chiusi?</string>
     <string name="message_print_SSCC_list_on_close_order">Vuoi stampare le etichette SSCC degli ordini chiusi?</string>
     <string name="action_print_SSCC_only_remaining">Stampa solo le nuove etichette</string>

From 6d431bb251d6f8007280a240d84e3276e095ac4d Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 16 Jan 2025 16:57:28 +0100
Subject: [PATCH 079/103] -> v1.42.03 (463)

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

diff --git a/app/build.gradle b/app/build.gradle
index 4d5cdc41..3dc9d556 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 462
-    def appVersionName = '1.42.02'
+    def appVersionCode = 463
+    def appVersionName = '1.42.03'
 
     signingConfigs {
         release {

From bd04d6263e8f671703bc5acfa94b45752a27b3b1 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 17 Jan 2025 13:12:12 +0100
Subject: [PATCH 080/103] Aggiornati build.gradle

# Conflicts:
#	app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java
#	app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
---
 .idea/deploymentTargetSelector.xml          |  2 +-
 .idea/kotlinc.xml                           |  2 +-
 app/build.gradle                            | 35 ++++++++++++---------
 barcode_base_android_library/build.gradle   | 12 ++++---
 build.gradle                                | 12 +++----
 gradle/wrapper/gradle-wrapper.properties    |  2 +-
 honeywellscannerlibrary/build.gradle        |  9 ++++--
 keyobardemulatorscannerlibrary/build.gradle | 11 +++++--
 pointmobilescannerlibrary/build.gradle      | 13 +++++---
 zebrascannerlibrary/build.gradle            | 11 +++++--
 10 files changed, 70 insertions(+), 39 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 1d0d251a..eb6eecea 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-01-09T09:29:04.931795900Z">
+        <DropdownSelection timestamp="2025-01-17T09:18:08.345092200Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=21088B8EFD" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index e805548a..4cb74572 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.20" />
+    <option name="version" value="1.9.25" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3dc9d556..66bd05fe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ if (!project.hasProperty("disable-performance-plugin")) {
 }
 
 apply plugin: 'com.google.firebase.crashlytics'
-apply plugin: 'kotlin-android'
+//apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 
 android {
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode appVersionCode
         versionName appVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.release
 
         javaCompileOptions {
@@ -80,30 +80,37 @@ android {
     }
 
     gradle.projectsEvaluated {
-        tasks.withType(JavaCompile.class) {
-            options.compilerArgs << "-Xmaxerrs" << "10000"
+        tasks.withType(JavaCompile.class).tap {
+            configureEach {
+                options.compilerArgs << "-Xmaxerrs" << "10000"
+            }
         }
     }
     lint {
         abortOnError false
     }
     namespace 'it.integry.integrywmsnative'
-    compileSdk 34
+    compileSdk 35
+}
+
+configurations {
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+//    androidTestImplementation('androidx.test.espresso:espresso-core:3.6.1', {
+//        exclude group: 'com.android.support', module: 'support-annotations'
+//    })
+//    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'com.github.lupaulus:logger:2.3.2'
 
     //Firebase
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:33.7.0')
+    implementation platform('com.google.firebase:firebase-bom:33.8.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
@@ -115,7 +122,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
 
     implementation('androidx.preference:preference-ktx:1.2.1') {
         exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel'
@@ -132,7 +139,7 @@ dependencies {
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
-    def dagger2_version = '2.49'
+    def dagger2_version = '2.55'
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
diff --git a/barcode_base_android_library/build.gradle b/barcode_base_android_library/build.gradle
index 71604865..d2d34472 100644
--- a/barcode_base_android_library/build.gradle
+++ b/barcode_base_android_library/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         minSdkVersion 21
-        targetSdk 34
+        targetSdk 35
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }
 
@@ -19,7 +18,7 @@ android {
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
-      targetCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     lint {
         abortOnError false
@@ -29,6 +28,11 @@ android {
 
 }
 
+configurations {
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
diff --git a/build.gradle b/build.gradle
index b8a52f85..25a4d35e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,8 +2,8 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.9.20'
-        agp_version = '8.7.2'
+        kotlin_version = '2.1.0'
+        agp_version = '8.8.0'
     }
 
     repositories {
@@ -12,13 +12,13 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$agp_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.4.1'
+        //classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.google.gms:google-services:4.4.2'
 
         classpath 'com.google.firebase:perf-plugin:1.4.2'
 
         // Add the Firebase Crashlytics Gradle plugin.
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -40,7 +40,7 @@ allprojects {
 //    }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index af8dff6c..38073ce8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Feb 13 15:14:43 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/honeywellscannerlibrary/build.gradle b/honeywellscannerlibrary/build.gradle
index 56891476..fc0f16a9 100644
--- a/honeywellscannerlibrary/build.gradle
+++ b/honeywellscannerlibrary/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         minSdkVersion 21
-        targetSdk 34
+        targetSdk 35
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -29,6 +29,11 @@ android {
 
 }
 
+configurations {
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+}
+
 dependencies {
 //    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 
diff --git a/keyobardemulatorscannerlibrary/build.gradle b/keyobardemulatorscannerlibrary/build.gradle
index 6b05d719..08b3fb7a 100644
--- a/keyobardemulatorscannerlibrary/build.gradle
+++ b/keyobardemulatorscannerlibrary/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         minSdkVersion 21
-        targetSdk 34
+        targetSdk 35
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }
 
@@ -29,6 +29,11 @@ android {
 
 }
 
+configurations {
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
diff --git a/pointmobilescannerlibrary/build.gradle b/pointmobilescannerlibrary/build.gradle
index b084ab91..a412d247 100644
--- a/pointmobilescannerlibrary/build.gradle
+++ b/pointmobilescannerlibrary/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         minSdkVersion 21
-        targetSdk 34
+        targetSdk 35
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -19,7 +19,7 @@ android {
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
-      targetCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     lint {
         abortOnError false
@@ -28,6 +28,11 @@ android {
 
 }
 
+configurations {
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+}
+
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.6.1'
diff --git a/zebrascannerlibrary/build.gradle b/zebrascannerlibrary/build.gradle
index 7d952295..59d32ead 100644
--- a/zebrascannerlibrary/build.gradle
+++ b/zebrascannerlibrary/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         minSdkVersion 21
-        targetSdk 34
+        targetSdk 35
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -28,6 +28,11 @@ android {
 
 }
 
+configurations {
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+}
+
 dependencies {
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])

From c498a373f556febba32af36c48da8c1e12a8f423 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 17 Jan 2025 13:13:34 +0100
Subject: [PATCH 081/103] =?UTF-8?q?Rimosso=20layout=20dialog=5Fask=5Fshoul?=
 =?UTF-8?q?d=5Fprint.xml=20non=20pi=C3=B9=20utilizzato?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/dialog_ask_should_print.xml    | 177 ------------------
 1 file changed, 177 deletions(-)
 delete mode 100644 app/src/main/res/layout/dialog_ask_should_print.xml

diff --git a/app/src/main/res/layout/dialog_ask_should_print.xml b/app/src/main/res/layout/dialog_ask_should_print.xml
deleted file mode 100644
index db971b3e..00000000
--- a/app/src/main/res/layout/dialog_ask_should_print.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layout xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:orientation="vertical"
-        app:cardCornerRadius="12dp"
-        app:cardElevation="0dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/light_blue_300"
-                android:gravity="center_horizontal">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="24dp"
-                    android:src="@drawable/ic_error_white_24dp" />
-
-            </RelativeLayout>
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingLeft="24dp"
-                android:paddingTop="24dp"
-                android:paddingRight="24dp">
-
-                <TextView
-                    android:id="@+id/title_text"
-                    style="@style/TextViewMaterial.Dialog.HeadlineText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:text="@string/action_print" />
-
-                <TextView
-                    android:id="@+id/description_text"
-                    style="@style/TextViewMaterial"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginBottom="16dp"
-                    android:gravity="left"
-                    android:text="@string/message_print_packing_list" />
-
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp">
-
-                    <androidx.constraintlayout.widget.Guideline
-                        android:id="@+id/center_buttons_guideline"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintGuide_percent="0.5" />
-
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/button_abort"
-                        style="@style/Button.PrimaryOutline"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:text="@string/no"
-                        app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:strokeColor="?colorPrimary" />
-
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/button_confirm"
-                        style="@style/Button.PrimaryFull"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:text="@string/yes"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="@id/center_buttons_guideline"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-
-    </androidx.cardview.widget.CardView>
-
-    <!--<androidx.appcompat.widget.AppCompatTextView-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:text="@string/action_print"-->
-    <!--style="@style/TextViewMaterial.Dialog.HeadlineText"-->
-    <!--android:gravity="center_horizontal"/>-->
-
-
-    <!--<LinearLayout-->
-    <!--android:orientation="vertical"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="match_parent"-->
-    <!--android:padding="16dp">-->
-
-    <!--<LinearLayout-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="match_parent"-->
-    <!--android:orientation="horizontal"-->
-    <!--android:gravity="center_horizontal">-->
-
-    <!--<androidx.appcompat.widget.AppCompatTextView-->
-    <!--android:id="@+id/print_message"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_margin="16dp"-->
-    <!--style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"-->
-    <!--android:textColor="#5F6368"-->
-    <!--android:textSize="16sp"-->
-    <!--android:layout_gravity="center"-->
-    <!--android:gravity="center_horizontal"-->
-    <!--tools:text="La procedura stamperà una packing list"/>-->
-
-    <!--</LinearLayout>-->
-
-
-    <!--<LinearLayout-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="match_parent"-->
-    <!--android:orientation="horizontal"-->
-    <!--android:paddingTop="8dp"-->
-    <!--android:gravity="bottom|center_horizontal">-->
-
-
-    <!--<com.google.android.material.button.MaterialButton-->
-    <!--android:id="@+id/button_abort"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--style="@style/Button.PrimaryOutline"-->
-    <!--app:icon="@drawable/ic_clear_24dp"-->
-    <!--android:layout_marginEnd="8dp"-->
-    <!--android:text="@android:string/no"/>-->
-
-
-    <!--<com.google.android.material.button.MaterialButton-->
-    <!--android:id="@+id/button_confirm"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--style="@style/Button.PrimaryFull"-->
-    <!--app:icon="@drawable/ic_print_24dp"-->
-    <!--android:text="@android:string/yes"/>-->
-    <!--</LinearLayout>-->
-
-    <!--</LinearLayout>-->
-
-    <!--</LinearLayout>-->
-    <!--</androidx.cardview.widget.CardView>-->
-
-</layout>
\ No newline at end of file

From b1bc72a1a5970f92f091a95d1d8d0ad319cd474b Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 17 Jan 2025 13:14:29 +0100
Subject: [PATCH 082/103] -> v1.42.04 (464)

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

diff --git a/app/build.gradle b/app/build.gradle
index 66bd05fe..a41dbf6d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 463
-    def appVersionName = '1.42.03'
+    def appVersionCode = 464
+    def appVersionName = '1.42.04'
 
     signingConfigs {
         release {

From 20602cadb5e536222fb80f4b8bf19538f01afb5f Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 20 Jan 2025 12:54:54 +0100
Subject: [PATCH 083/103] Fix sulla descrizione durante il salvataggio di un
 nuovo articolo

---
 .../dialogs/create_new_art/DialogCreateNewArtViewModel.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtViewModel.java
index 1b0a2ace..9312c1ea 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtViewModel.java
@@ -155,7 +155,7 @@ public class DialogCreateNewArtViewModel {
                 barcodeProdotto.validate()
         ) {
             ArticoloDTO articoloToSave = new ArticoloDTO()
-                    .setDescrizione(descrizione.get())
+                    .setDescrizione(descrizione.get() != null ? descrizione.get().substring(0, Math.min(40, descrizione.get().length())) : null)
                     .setDescrizioneEstesa(descrizione.get())
                     .setNote(UtilityString.empty2null(noteAggiuntive.get()))
                     .setCodMgrp(selectedMtbGrup.get().getCodMgrp())

From ddc441e76eef7959e16e94fd36eb9c8ae0ed3a32 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 20 Jan 2025 17:57:05 +0100
Subject: [PATCH 084/103] =?UTF-8?q?Refactoring=20UI=20di=20ContenutoBancal?=
 =?UTF-8?q?e.=20Refactoring=20del=20model=20MtbTcol,=20adesso=20=C3=A8=20c?=
 =?UTF-8?q?ompletamente=20observable.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MainApplicationModule.java                |    4 +-
 .../integrywmsnative/SplashActivity.java      |    4 +-
 .../core/di/BindableBigDecimal.java           |    2 +-
 .../integrywmsnative/core/di/Converters.java  |   41 +-
 .../core/helper/GestioneToTextConverter.java  |   16 +
 .../integrywmsnative/core/model/MtbColt.java  |   26 +-
 .../integrywmsnative/core/model/MtbTCol.java  |   10 +-
 .../core/model/mapper/MtbTcolMapper.java      |   29 +
 .../model/observable/ObservableMtbTcol.java   |  127 ++
 .../rest/consumers/ImballiRESTConsumer.java   |   13 +-
 .../consumers/ImballiRESTConsumerService.java |    2 +-
 .../core/settings/DBSettingsModel.java        |   14 +
 .../core/settings/SettingsManager.java        |   29 +-
 .../AccettazioneBollaPickingActivity.java     |   22 +-
 .../AccettazioneBollaPickingViewModel.java    |   15 +-
 .../AccettazioneOrdiniPickingActivity.java    |   14 +-
 .../AccettazioneOrdiniPickingViewModel.java   |   13 +-
 .../OrdiniUscitaElencoFragment.java           |    5 +-
 .../picking_resi/PickingResiActivity.java     |   14 +-
 .../picking_resi/PickingResiViewModel.java    |   14 +-
 ...ntroMerceOrderDetailPickedQuantityDTO.java |    8 +-
 .../gest/spedizione/SpedizioneActivity.java   |   16 +-
 .../gest/spedizione/SpedizioneViewModel.java  |   30 +-
 ...ttomSheetFragmentLUContentListAdapter.java |    7 +-
 ...BottomSheetFragmentLUContentViewModel.java |   12 +-
 .../DialogInfoAggiuntiveLUModule.java         |    5 +-
 .../DialogInfoAggiuntiveLUView.java           |   44 +-
 .../DialogInfoAggiuntiveLUViewModel.java      |   23 +-
 .../DialogInputLUProdResultDTO.java           |    8 +-
 .../input_lu_prod/DialogInputLUProdView.java  |    4 +-
 .../DialogInputLUProdViewModel.java           |   11 +-
 .../DialogInputLUProdTipoColloAdapter.java    |   19 +-
 .../DialogInputLUProdTipoColloListModel.java  |    8 +-
 .../input_peso_lu/DialogInputPesoLUView.java  |   42 +-
 .../DialogTracciamentoImballiModule.java      |    5 +-
 .../DialogTracciamentoImballiViewModel.java   |   22 +-
 ...gTracciamentoImballi_TipoColloAdapter.java |   10 +-
 .../main/res/drawable/circle_background.xml   |    5 +
 .../res/drawable/ic_round_business_24.xml     |    5 +
 .../bottom_sheet_fragment__lu_content.xml     | 1263 +++++++++++------
 ..._sheet_fragment__lu_content__list_item.xml |  208 +--
 .../res/layout/dialog_info_aggiuntive_lu.xml  |    3 +-
 .../layout/fragment_main_ordini_uscita.xml    |    6 +-
 app/src/main/res/values/config.xml            |    1 +
 44 files changed, 1400 insertions(+), 779 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/helper/GestioneToTextConverter.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/model/mapper/MtbTcolMapper.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/model/observable/ObservableMtbTcol.java
 create mode 100644 app/src/main/res/drawable/circle_background.xml
 create mode 100644 app/src/main/res/drawable/ic_round_business_24.xml

diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
index a8d6cc90..3d6504ac 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
@@ -82,8 +82,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    public SettingsManager provideSettingsManager(SystemRESTConsumer systemRESTConsumer, AziendaRESTConsumer aziendaRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, GestSetupRESTConsumer gestSetupRESTConsumer) {
-        return new SettingsManager(mApplication, systemRESTConsumer, aziendaRESTConsumer, gestSetupRESTConsumer, posizioniRESTConsumer);
+    public SettingsManager provideSettingsManager(SystemRESTConsumer systemRESTConsumer, ImballiRESTConsumer imballiRESTConsumer, AziendaRESTConsumer aziendaRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, GestSetupRESTConsumer gestSetupRESTConsumer) {
+        return new SettingsManager(mApplication, systemRESTConsumer, imballiRESTConsumer, aziendaRESTConsumer, gestSetupRESTConsumer, posizioniRESTConsumer);
     }
 
     @Provides
diff --git a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
index e38e3df1..608dad3a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
@@ -103,12 +103,12 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
 
     @Override
     public void onDBDataLoading(String item) {
-        mBinding.loadingInfoTextview.setText("Caricamento " + item);
+        runOnUiThread(() -> mBinding.loadingInfoTextview.setText("Caricamento " + item));
     }
 
     @Override
     public void onMenuLoading() {
-        mBinding.loadingInfoTextview.setText("Caricamento menù");
+        runOnUiThread(() -> mBinding.loadingInfoTextview.setText("Caricamento menù"));
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBigDecimal.java b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBigDecimal.java
index 4c4c7487..0fb287b9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBigDecimal.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBigDecimal.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 
-public class BindableBigDecimal  implements Observable {
+public class BindableBigDecimal implements Observable {
 
     BigDecimal mValue;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
index 0fdf8ca2..b33fedd6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
@@ -105,7 +105,7 @@ public class Converters {
             view.setTag(R.id.bound_observable, new Pair<>(observableField, watcher));
             view.addTextChangedListener(watcher);
         }
-        String newValue = observableField.get();
+        String newValue = observableField != null ? observableField.get() : "";
         if (!view.getText().toString().equals(newValue)) {
             view.setText(newValue);
         }
@@ -819,6 +819,45 @@ public class Converters {
     }
 
 
+    @BindingAdapter("visibilityWhenNotNull")
+    public static void bindViewVisibilityWhenNotNull(View view, ObservableField<?> bindableObject) {
+        if(bindableObject == null) return;
+
+        if (view.getTag(R.id.bound_observable) != bindableObject) {
+            view.setTag(R.id.bound_observable, bindableObject);
+        }
+
+        bindableObject.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                view.setVisibility(bindableObject.get() == null ? View.GONE : View.VISIBLE);
+            }
+        });
+
+        view.setVisibility(bindableObject.get() == null ? View.GONE : View.VISIBLE);
+    }
+
+
+    @BindingAdapter("visibilityWhenNull")
+    public static void bindViewVisibilityWhenNull(View view, ObservableField<?> bindableObject) {
+
+        if (view.getTag(R.id.bound_observable_visibility) != bindableObject) {
+            view.setTag(R.id.bound_observable_visibility, bindableObject);
+        }
+
+        view.setVisibility(bindableObject == null || bindableObject.get() == null ? View.VISIBLE : View.GONE);
+
+        if(bindableObject == null) return;
+
+        bindableObject.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                view.setVisibility(bindableObject.get() == null ? View.VISIBLE : View.GONE);
+            }
+        });
+    }
+
+
     @BindingAdapter({"reverse_visibility"})
     public static void bindViewReverseVisibility(View view, final BindableBoolean bindableBoolean) {
         if (view.getTag(R.id.bound_reverse_visibility) != bindableBoolean) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/helper/GestioneToTextConverter.java b/app/src/main/java/it/integry/integrywmsnative/core/helper/GestioneToTextConverter.java
new file mode 100644
index 00000000..c9325cf4
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/helper/GestioneToTextConverter.java
@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.core.helper;
+
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+
+public final class GestioneToTextConverter {
+
+    public static String convert(GestioneEnum gestioneEnum) {
+        return switch (gestioneEnum) {
+            case ACQUISTO -> "Acquisto";
+            case PRODUZIONE -> "Produzione";
+            case LAVORAZIONE -> "Lavorazione";
+            case VENDITA -> "Vendita";
+        };
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
index 6d2dacf5..8fe74188 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.model;
 import android.text.TextUtils;
 
 import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableField;
 
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
@@ -16,6 +17,7 @@ import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
@@ -64,7 +66,7 @@ public class MtbColt extends EntityBase {
     private BigDecimal altezzaCm;
     private String codJcom;
 
-    private MtbTCol mtbTCol;
+    private final ObservableField<ObservableMtbTcol> mtbTCol = new ObservableField<>();
 
     private Boolean disablePrint;
     private String ragSocCliente;
@@ -258,6 +260,16 @@ public class MtbColt extends EntityBase {
 
     public MtbColt setCodTcol(String codTcol) {
         this.codTcol = codTcol;
+
+        if(!UtilityString.isNullOrEmpty(codTcol)) {
+            var fountMtbTcolObservable = SettingsManager.iDB().getInternalImballi().stream()
+                    .filter(x -> x.getCodTcol().equalsIgnoreCase(codTcol))
+                    .findFirst()
+                    .orElse(null);
+            this.setMtbTCol(fountMtbTcolObservable);
+        } else
+            this.setMtbTCol(null);
+
         return this;
     }
 
@@ -532,15 +544,19 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
-    public MtbTCol getMtbTCol() {
-        return mtbTCol;
+    public ObservableMtbTcol getMtbTCol() {
+        return mtbTCol.get();
     }
 
-    public MtbColt setMtbTCol(MtbTCol mtbTCol) {
-        this.mtbTCol = mtbTCol;
+    public MtbColt setMtbTCol(ObservableMtbTcol mtbTCol) {
+        this.mtbTCol.set(mtbTCol);
         return this;
     }
 
+    public ObservableField<ObservableMtbTcol> mtbTcolProperty() {
+        return mtbTCol;
+    }
+
     public void generaFiltroOrdineFromDTO(List<FiltroOrdineDTO> filtroOrdineDtos) {
 
         String xmlPrefix = "{\"whereCond\": \"";
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java
index 990a1d02..99824340 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java
@@ -15,7 +15,7 @@ public class MtbTCol {
     private BigDecimal taraKg;
     private String descrizione;
     private String codMart;
-    private FlagUiUlEnum flagUIUL;
+    private FlagUiUlEnum flagUiUl;
     private String circuito;
 
     public String getCodTcol() {
@@ -90,12 +90,12 @@ public class MtbTCol {
         return this;
     }
 
-    public FlagUiUlEnum getFlagUIUL() {
-        return flagUIUL;
+    public FlagUiUlEnum getFlagUiUl() {
+        return flagUiUl;
     }
 
-    public void setFlagUIUL(FlagUiUlEnum flagUIUL) {
-        this.flagUIUL = flagUIUL;
+    public void setFlagUiUl(FlagUiUlEnum flagUiUl) {
+        this.flagUiUl = flagUiUl;
     }
 
     public String getCircuito() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/mapper/MtbTcolMapper.java b/app/src/main/java/it/integry/integrywmsnative/core/model/mapper/MtbTcolMapper.java
new file mode 100644
index 00000000..3d5d2220
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/mapper/MtbTcolMapper.java
@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.core.model.mapper;
+
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
+
+public class MtbTcolMapper {
+
+    public static ObservableMtbTcol fromDTO(MtbTCol dto) {
+        ObservableMtbTcol mtbTcol = new ObservableMtbTcol();
+        mtbTcol.updateFromDTO(dto);
+        return mtbTcol;
+    }
+
+    public static ObservableList<ObservableMtbTcol> fromDTOList(List<MtbTCol> dto) {
+        ObservableList<ObservableMtbTcol> mtbTCols = new ObservableArrayList<>();
+
+        mtbTCols.addAll(dto.stream().map(MtbTcolMapper::fromDTO)
+                .collect(Collectors.toUnmodifiableList()));
+
+        return mtbTCols;
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/observable/ObservableMtbTcol.java b/app/src/main/java/it/integry/integrywmsnative/core/model/observable/ObservableMtbTcol.java
new file mode 100644
index 00000000..a161df0b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/observable/ObservableMtbTcol.java
@@ -0,0 +1,127 @@
+package it.integry.integrywmsnative.core.model.observable;
+
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+import androidx.databinding.ObservableField;
+
+import java.math.BigDecimal;
+
+import it.integry.integrywmsnative.core.model.MtbTCol;
+
+public class ObservableMtbTcol extends BaseObservable {
+
+    private final ObservableField<String> codTcol = new ObservableField<>();
+    private final ObservableField<BigDecimal> pesoKg = new ObservableField<>();
+    private final ObservableField<BigDecimal> lunghezzaCm = new ObservableField<>();
+    private final ObservableField<BigDecimal> larghezzaCm = new ObservableField<>();
+    private final ObservableField<BigDecimal> altezzaCm = new ObservableField<>();
+    private final ObservableField<BigDecimal> taraKg = new ObservableField<>();
+    private final ObservableField<String> descrizione = new ObservableField<>();
+    private final ObservableField<String> codMart = new ObservableField<>();
+    private final ObservableField<MtbTCol.FlagUiUlEnum> flagUIUL = new ObservableField<>();
+    private final ObservableField<String> circuito = new ObservableField<>();
+
+    @Bindable
+    public String getCodTcol() {
+        return codTcol.get();
+    }
+
+    @Bindable
+    public BigDecimal getPesoKg() {
+        return pesoKg.get();
+    }
+
+    @Bindable
+    public BigDecimal getLunghezzaCm() {
+        return lunghezzaCm.get();
+    }
+
+    @Bindable
+    public BigDecimal getLarghezzaCm() {
+        return larghezzaCm.get();
+    }
+
+    @Bindable
+    public BigDecimal getAltezzaCm() {
+        return altezzaCm.get();
+    }
+
+    @Bindable
+    public BigDecimal getTaraKg() {
+        return taraKg.get();
+    }
+
+    @Bindable
+    public String getDescrizione() {
+        return descrizione.get();
+    }
+
+    @Bindable
+    public String getCodMart() {
+        return codMart.get();
+    }
+
+    @Bindable
+    public MtbTCol.FlagUiUlEnum getFlagUIUL() {
+        return flagUIUL.get();
+    }
+
+    @Bindable
+    public String getCircuito() {
+        return circuito.get();
+    }
+
+
+    public ObservableField<String> codTcolProperty() {
+        return codTcol;
+    }
+
+    public ObservableField<BigDecimal> pesoKgProperty() {
+        return pesoKg;
+    }
+
+    public ObservableField<BigDecimal> lunghezzaCmProperty() {
+        return lunghezzaCm;
+    }
+
+    public ObservableField<BigDecimal> larghezzaCmProperty() {
+        return larghezzaCm;
+    }
+
+    public ObservableField<BigDecimal> altezzaCmProperty() {
+        return altezzaCm;
+    }
+
+    public ObservableField<BigDecimal> taraKgProperty() {
+        return taraKg;
+    }
+
+    public ObservableField<String> descrizioneProperty() {
+        return descrizione;
+    }
+
+    public ObservableField<String> codMartProperty() {
+        return codMart;
+    }
+
+    public ObservableField<MtbTCol.FlagUiUlEnum> flagUIULProperty() {
+        return flagUIUL;
+    }
+
+    public ObservableField<String> circuitoProperty() {
+        return circuito;
+    }
+
+    public void updateFromDTO(MtbTCol mtbTCol) {
+        codTcol.set(mtbTCol.getCodTcol());
+        pesoKg.set(mtbTCol.getPesoKg());
+        lunghezzaCm.set(mtbTCol.getLunghezzaCm());
+        larghezzaCm.set(mtbTCol.getLarghezzaCm());
+        altezzaCm.set(mtbTCol.getAltezzaCm());
+        taraKg.set(mtbTCol.getTaraKg());
+        descrizione.set(mtbTCol.getDescrizione());
+        codMart.set(mtbTCol.getCodMart());
+        flagUIUL.set(mtbTCol.getFlagUiUl());
+        circuito.set(mtbTCol.getCircuito());
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java
index 5c899ef4..c789f5ce 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java
@@ -7,6 +7,8 @@ import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.mapper.MtbTcolMapper;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.imballi.ImballoQuantityDTO;
@@ -24,18 +26,19 @@ public class ImballiRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public List<MtbTCol> retrieveTipiColloSyncronized(MtbTCol.FlagUiUlEnum tipoImballo) throws Exception {
+    public List<ObservableMtbTcol> retrieveImballiSyncronized(MtbTCol.FlagUiUlEnum tipoImballo) throws Exception {
         ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
-        Response<ServiceRESTResponse<List<MtbTCol>>> response = service.retrieveTipiCollo(tipoImballo)
+        Response<ServiceRESTResponse<List<MtbTCol>>> response = service.retrieveImballi(tipoImballo)
                 .execute();
 
-        return analyzeAnswer(response, "retrieveTipiCollo");
+        List<MtbTCol> retrieveTipiCollo = analyzeAnswer(response, "retrieveTipiCollo");
+        return MtbTcolMapper.fromDTOList(retrieveTipiCollo);
     }
 
-    public void retrieveTipiCollo(MtbTCol.FlagUiUlEnum tipoImballo, RunnableArgs<List<MtbTCol>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void retrieveImballi(MtbTCol.FlagUiUlEnum tipoImballo, RunnableArgs<List<ObservableMtbTcol>> onComplete, RunnableArgs<Exception> onFailed) {
         executorService.execute(() -> {
             try {
-                var response = retrieveTipiColloSyncronized(tipoImballo);
+                var response = retrieveImballiSyncronized(tipoImballo);
                 if (onComplete != null) onComplete.run(response);
             } catch (Exception ex) {
                 if (onFailed != null) onFailed.run(ex);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumerService.java
index 5b88224b..294bb66b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumerService.java
@@ -16,7 +16,7 @@ public interface ImballiRESTConsumerService {
 
 
     @GET("wms/imballi/retrieve/{tipo}")
-    Call<ServiceRESTResponse<List<MtbTCol>>> retrieveTipiCollo(@Path("tipo") MtbTCol.FlagUiUlEnum tipo);
+    Call<ServiceRESTResponse<List<MtbTCol>>> retrieveImballi(@Path("tipo") MtbTCol.FlagUiUlEnum tipo);
 
     @POST("wms/imballi/registraCarico")
     Call<ServiceRESTResponse<Void>> registraCarico(@Body RegistraCaricoImballiRequestDTO registraCaricoImballiRequest);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index 1606cc9c..3c804c7c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -1,11 +1,15 @@
 package it.integry.integrywmsnative.core.settings;
 
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.Azienda;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 
 public class DBSettingsModel {
@@ -16,6 +20,7 @@ public class DBSettingsModel {
 
     private Azienda datiAzienda = null;
     private List<InternalCodAnagsDTO> internalCodAnags = null;
+    private ObservableList<ObservableMtbTcol> internalImballi = new ObservableArrayList<>();
 
     private boolean enableCheckPartitaMagCheckPickingV;
     private boolean flagMultiClienteOrdV;
@@ -132,6 +137,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public ObservableList<ObservableMtbTcol> getInternalImballi() {
+        return internalImballi;
+    }
+
+    public DBSettingsModel setInternalImballi(ObservableList<ObservableMtbTcol> internalImballi) {
+        this.internalImballi = internalImballi;
+        return this;
+    }
+
     public List<AvailableCodMdepsDTO> getAvailableCodMdep() {
         return availableCodMdep;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index 1a4f4bd9..f5671261 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.settings;
 
 import android.content.Context;
 
+import androidx.databinding.ObservableArrayList;
+
 import com.google.firebase.perf.metrics.Trace;
 import com.google.gson.reflect.TypeToken;
 
@@ -16,9 +18,12 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.rest.consumers.AziendaRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
@@ -38,17 +43,20 @@ public class SettingsManager {
 
     private static Context mContext;
     private static SystemRESTConsumer mSystemRESTConsumer;
+    private static ImballiRESTConsumer mImballiRESTConsumer;
     private static AziendaRESTConsumer mAziendaRESTConsumer;
     private static GestSetupRESTConsumer mGestSetupRESTConsumer;
     private static PosizioniRESTConsumer mPosizioniRESTConsumer;
 
     public SettingsManager(Context context,
                            SystemRESTConsumer systemRESTConsumer,
+                           ImballiRESTConsumer imballiRESTConsumer,
                            AziendaRESTConsumer aziendaRESTConsumer,
                            GestSetupRESTConsumer gestSetupRESTConsumer,
                            PosizioniRESTConsumer posizioniRESTConsumer) {
         mContext = context;
         mSystemRESTConsumer = systemRESTConsumer;
+        mImballiRESTConsumer = imballiRESTConsumer;
         mAziendaRESTConsumer = aziendaRESTConsumer;
         mGestSetupRESTConsumer = gestSetupRESTConsumer;
         mPosizioniRESTConsumer = posizioniRESTConsumer;
@@ -124,12 +132,31 @@ public class SettingsManager {
                 loadGestSetupValues(() -> {
 
                     onProgress.run("dati azienda");
-                    loadDatiAzienda(tmpOnComplete, tmpOnFailed);
+                    loadDatiAzienda(() -> {
+
+                        loadTipiCollo(tmpOnComplete, tmpOnFailed);
+
+                    }, tmpOnFailed);
                 }, tmpOnFailed);
             }, tmpOnFailed);
         }, tmpOnFailed);
     }
 
+    private static void loadTipiCollo(Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        mImballiRESTConsumer.retrieveImballi(MtbTCol.FlagUiUlEnum.UL, tipiColloUl -> {
+            mImballiRESTConsumer.retrieveImballi(MtbTCol.FlagUiUlEnum.UI, tipiColloUi -> {
+
+                var imballiList = new ObservableArrayList<ObservableMtbTcol>();
+                imballiList.addAll(tipiColloUi);
+                imballiList.addAll(tipiColloUl);
+
+                SettingsManager.iDB().setInternalImballi(imballiList);
+                onComplete.run();
+            }, onFailed);
+        }, onFailed);
+
+    }
+
     private static void loadDatiAzienda(Runnable onComplete, RunnableArgs<Exception> onFailed) {
 
         mAziendaRESTConsumer.retrieveAzienda(datiAzienda -> {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
index 31572319..10d5a499 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
@@ -41,8 +41,8 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.report.ReportManager;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
@@ -89,9 +89,9 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
     private ActivityAccettazioneBollaPickingBinding mBindings;
 
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
-    
+
     private final AccettazioneBollaPickingFilterViewModel mAppliedFilterViewModel = new AccettazioneBollaPickingFilterViewModel();
-    
+
     private final ObservableArrayList<AccettazioneBollaPickingListModel> mAccettazioneMutableData = new ObservableArrayList<>();
 
     public BindableBoolean noItemsToPick = new BindableBoolean(false);
@@ -231,7 +231,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
                 refreshList();
             }
         };
-        
+
         mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(onPredicateChanged);
 
         List<FilterChipDTO> filterList = Stream.of(AccettazioneBollaPickingBindings.AVAILABLE_FILTERS.entrySet()).map(Map.Entry::getValue).sortBy(FilterChipDTO::getPosizione).toList();
@@ -327,7 +327,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
                 mAppliedFilterViewModel.applyAllTests();
                 tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
             } else {
-            tmpList = mViewModel.getPickingList().getValue();
+                tmpList = mViewModel.getPickingList().getValue();
             }
 
             var list = convertDataModelToListModel(tmpList);
@@ -546,6 +546,16 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         this.mViewModel.deleteRow(mtbColr);
     }
 
+    @Override
+    public void onRequestChangeMtbTcol(MtbColt mtbColt) {
+        DialogInfoAggiuntiveLUView.newInstance(mtbColt, false, true, (note, mtbTcol) -> {
+                    onLoadingStarted();
+                    mViewModel.updateTipoUl(mtbTcol, this::onLoadingEnded);
+                }, () -> {
+                })
+                .show(getSupportFragmentManager(), "dialog-note-aggiuntive");
+    }
+
     @Override
     public void onBottomSheetLUClose() {
         this.mViewModel.closeLU();
@@ -560,7 +570,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
     }
 
     @Override
-    public void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
+    public void onInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded)
                 .show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
index 0e94d5e8..aec586ae 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
@@ -30,9 +30,9 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
@@ -409,7 +409,7 @@ public class AccettazioneBollaPickingViewModel {
         });
     }
 
-    private void manageInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
+    private void manageInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         if (!SettingsManager.iDB().isFlagAccettazioneBollaAskTipoCollo()) {
             onComplete.run(null, null);
             return;
@@ -888,6 +888,13 @@ public class AccettazioneBollaPickingViewModel {
         this.mPickingList.postValue(this.mPickingList.getValue());
     }
 
+    public void updateTipoUl(ObservableMtbTcol newTipoUL, Runnable onComplete) {
+        mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL.getCodTcol(), () -> {
+            mCurrentMtbColt.setCodTcol(newTipoUL.getCodTcol());
+            onComplete.run();
+        }, this::sendError);
+    }
+
     private void addHistoryItem(@NonNull MtbColr mtbColr) {
         Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts)
                 .filter(x -> (x.getCodMart() != null && x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart())) ||
@@ -935,7 +942,7 @@ public class AccettazioneBollaPickingViewModel {
         if (this.mListener != null) this.mListener.onVersamentoAutomaticoULRequest(onComplete);
     }
 
-    private void sendOnInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
+    private void sendOnInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         if (this.mListener != null) this.mListener.onInfoAggiuntiveRequest(onComplete);
     }
 
@@ -1037,7 +1044,7 @@ public class AccettazioneBollaPickingViewModel {
 
         void onVersamentoAutomaticoULRequest(RunnableArgs<Boolean> onComplete);
 
-        void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete);
+        void onInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete);
 
         void onError(Exception ex);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
index 78f42a9e..99ef94a5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
@@ -44,8 +44,8 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.report.ReportManager;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
@@ -714,6 +714,16 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         this.mViewModel.deleteRow(mtbColr);
     }
 
+    @Override
+    public void onRequestChangeMtbTcol(MtbColt mtbColt) {
+        DialogInfoAggiuntiveLUView.newInstance(mtbColt, false, true, (note, mtbTcol) -> {
+                    onLoadingStarted();
+                    mViewModel.updateTipoUl(mtbTcol, this::onLoadingEnded);
+                }, () -> {
+                })
+                .show(getSupportFragmentManager(), "dialog-note-aggiuntive");
+    }
+
     @Override
     public void onBottomSheetLUClose() {
         this.mViewModel.closeLU();
@@ -725,7 +735,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     }
 
     @Override
-    public void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
+    public void onInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded).show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
index 68bff77b..657299dc 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
@@ -32,9 +32,9 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
@@ -878,6 +878,13 @@ public class AccettazioneOrdiniPickingViewModel {
         this.mPickingList.postValue(this.mPickingList.getValue());
     }
 
+    public void updateTipoUl(ObservableMtbTcol newTipoUL, Runnable onComplete) {
+        mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL.getCodTcol(), () -> {
+            mCurrentMtbColt.setCodTcol(newTipoUL.getCodTcol());
+            onComplete.run();
+        }, this::sendError);
+    }
+
     private void addHistoryItem(@NonNull MtbColr mtbColr) {
         Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts)
                 .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()))
@@ -931,7 +938,7 @@ public class AccettazioneOrdiniPickingViewModel {
         if (this.mListener != null) this.mListener.onVersamentoAutomaticoULRequest(onComplete);
     }
 
-    private void sendOnInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
+    private void sendOnInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         if (this.mListener != null) this.mListener.onInfoAggiuntiveRequest(onComplete);
     }
 
@@ -1031,7 +1038,7 @@ public class AccettazioneOrdiniPickingViewModel {
 
         void onVersamentoAutomaticoULRequest(RunnableArgs<Boolean> onComplete);
 
-        void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete);
+        void onInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete);
 
         void onError(Exception ex);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
index 04534562..abcfb925 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.core.content.res.ResourcesCompat;
-import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
@@ -60,7 +59,6 @@ import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterAutom
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterClienteLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterDepositoLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterGruppoMercLayoutView;
-import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterPaeseLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterTermConsLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterVettoreLayoutView;
@@ -74,6 +72,7 @@ import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRo
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
 import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
 import it.integry.integrywmsnative.ui.filter_chips.FilterChipView;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, ISelectAllFragment, OrdiniUscitaElencoViewModel.Listener {
@@ -150,7 +149,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                              Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
 
-        mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main_ordini_uscita, container, false);
+        mBindings = FragmentMainOrdiniUscitaBinding.inflate(inflater, container, false);
 
         MainApplication.appComponent
                 .prodOrdineLavorazioneElencoComponent()
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
index 5a6bd055..186e2915 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
@@ -33,7 +33,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
@@ -270,13 +270,23 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
         this.mViewmodel.deleteRow(mtbColr);
     }
 
+    @Override
+    public void onRequestChangeMtbTcol(MtbColt mtbColt) {
+        DialogInfoAggiuntiveLUView.newInstance(mtbColt, false, true, (note, mtbTcol) -> {
+                    onLoadingStarted();
+                    mViewmodel.updateTipoUl(mtbTcol, this::onLoadingEnded);
+                }, () -> {
+                })
+                .show(getSupportFragmentManager(), "dialog-note-aggiuntive");
+    }
+
     @Override
     public void onBottomSheetLUClose() {
         this.mViewmodel.closeLU(true);
     }
 
     @Override
-    public void onInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete) {
+    public void onInfoAggiuntiveRequired(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded)
                 .show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java
index e1fa61b4..c3675d75 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java
@@ -28,8 +28,8 @@ import it.integry.integrywmsnative.core.model.CommonModelConsts;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
@@ -716,6 +716,13 @@ public class PickingResiViewModel {
         });
     }
 
+    public void updateTipoUl(ObservableMtbTcol newTipoUL, Runnable onComplete) {
+        mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL.getCodTcol(), () -> {
+            mCurrentMtbColt.setCodTcol(newTipoUL.getCodTcol());
+            onComplete.run();
+        }, this::sendError);
+    }
+
     public void resetMatchedRows() {
         for (WithdrawableDtbDocr pickingObjectDTO : this.mPickingList.getValue()) {
             pickingObjectDTO
@@ -732,7 +739,7 @@ public class PickingResiViewModel {
         return mPickingList;
     }
 
-    private void sendOnInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete) {
+    private void sendOnInfoAggiuntiveRequired(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         if (this.mListener != null) this.mListener.onInfoAggiuntiveRequired(onComplete);
     }
 
@@ -808,9 +815,10 @@ public class PickingResiViewModel {
         return this;
     }
 
+
     public interface Listener extends ILUPrintListener, ILoadingListener, ILUBaseOperationsListener {
 
-        void onInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete);
+        void onInfoAggiuntiveRequired(RunnableArgss<String, ObservableMtbTcol> onComplete);
 
         void onError(Exception ex);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java
index 950d8dec..47745eea 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java
@@ -3,7 +3,7 @@ package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail;
 import java.math.BigDecimal;
 
 import it.integry.integrywmsnative.core.model.JtbFasi;
-import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 
 public class ProdRientroMerceOrderDetailPickedQuantityDTO {
 
@@ -14,7 +14,7 @@ public class ProdRientroMerceOrderDetailPickedQuantityDTO {
     private BigDecimal taraCol;
     private BigDecimal pesoLordo;
 
-    private MtbTCol mtbTCol;
+    private ObservableMtbTcol mtbTCol;
     private JtbFasi jtbFasi;
 
     public BigDecimal getNumCnf() {
@@ -71,11 +71,11 @@ public class ProdRientroMerceOrderDetailPickedQuantityDTO {
         return this;
     }
 
-    public MtbTCol getMtbTCol() {
+    public ObservableMtbTcol getMtbTCol() {
         return mtbTCol;
     }
 
-    public ProdRientroMerceOrderDetailPickedQuantityDTO setMtbTCol(MtbTCol mtbTCol) {
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setMtbTCol(ObservableMtbTcol mtbTCol) {
         this.mtbTCol = mtbTCol;
         return this;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index b001f6de..c799dec5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -44,7 +44,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
-import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
@@ -1049,6 +1049,16 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
     }
 
+    @Override
+    public void onRequestChangeMtbTcol(MtbColt mtbColt) {
+        DialogInfoAggiuntiveLUView.newInstance(mtbColt, false, true, (note, mtbTcol) -> {
+                    onLoadingStarted();
+                    mViewmodel.updateTipoUl(mtbTcol, this::onLoadingEnded);
+                }, () -> {
+                })
+                .show(getSupportFragmentManager(), "dialog-note-aggiuntive");
+    }
+
     @Override
     public void onBottomSheetLUClose() {
         this.mViewmodel.requestCloseLU(true);
@@ -1081,8 +1091,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     }
 
     @Override
-    public void onInfoAggiuntiveRequired(MtbColt mtbColt, RunnableArgss<String, MtbTCol> onComplete) {
-        DialogInfoAggiuntiveLUView.newInstance(mtbColt, onComplete, this::onLoadingEnded)
+    public void onInfoAggiuntiveRequired(MtbColt mtbColt, RunnableArgss<String, ObservableMtbTcol> onComplete) {
+        DialogInfoAggiuntiveLUView.newInstance(mtbColt, true, true, onComplete, this::onLoadingEnded)
                 .show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
     }
 
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 db57f139..f6ebc061 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
@@ -43,10 +43,10 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.VtbVett;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
@@ -1497,14 +1497,28 @@ public class SpedizioneViewModel {
                 mCurrentMtbColt.getMtbColr().isEmpty();
         String newTipoUL = shouldChangeCodTcol ? refMtbColt.getCodTcol() : null;
 
-        if (shouldChangeCodTcol) {
-            mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL, () -> {
-                mCurrentMtbColt.setCodTcol(newTipoUL);
-                onComplete.run();
-            }, this::sendError);
+        ObservableMtbTcol newMtbTcol = SettingsManager.iDB().getInternalImballi().stream().filter(x -> x.getCodTcol().equalsIgnoreCase(newTipoUL))
+                .findFirst()
+                .orElse(null);
+
+        if(!UtilityString.isNullOrEmpty(newTipoUL) && newMtbTcol == null) {
+            this.sendError(new Exception("Impossibile riconoscere il tipo UL " + newTipoUL));
+            onComplete.run();
+            return;
+        }
+
+        if (shouldChangeCodTcol && newMtbTcol != null) {
+            updateTipoUl(newMtbTcol, onComplete);
         } else onComplete.run();
     }
 
+    public void updateTipoUl(ObservableMtbTcol newTipoUL, Runnable onComplete) {
+        mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL.getCodTcol(), () -> {
+            mCurrentMtbColt.setCodTcol(newTipoUL.getCodTcol());
+            onComplete.run();
+        }, this::sendError);
+    }
+
     private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
 
         this.sendOnLoadingStarted();
@@ -1763,7 +1777,7 @@ public class SpedizioneViewModel {
     }
 
     private void askInfoAggiuntive(Runnable onComplete) {
-        if (!SettingsManager.iDB().isFlagAskInfoAggiuntiveSpedizione()) {
+        if (mDefaultSegnoCol != -1 || !SettingsManager.iDB().isFlagAskInfoAggiuntiveSpedizione()) {
             onComplete.run();
             return;
         }
@@ -2093,7 +2107,7 @@ public class SpedizioneViewModel {
 
         void onFullItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canOverflowOrderQuantity, boolean canBatchLotBeChanged, RunnableArgss<PickedQuantityDTO, Boolean> onComplete);
 
-        void onInfoAggiuntiveRequired(MtbColt currentMtbColt, RunnableArgss<String, MtbTCol> onComplete);
+        void onInfoAggiuntiveRequired(MtbColt currentMtbColt, RunnableArgss<String, ObservableMtbTcol> onComplete);
 
         void onLUPositionChangeRequest(RunnableArgss<Boolean, MtbDepoPosizione> onComplete);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java
index dcd00bbe..201e6f69 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java
@@ -5,7 +5,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
 import androidx.recyclerview.widget.RecyclerView;
@@ -24,8 +23,8 @@ import it.integry.integrywmsnative.databinding.BottomSheetFragmentLuContentListI
 
 public class BottomSheetFragmentLUContentListAdapter extends RecyclerView.Adapter<BottomSheetFragmentLUContentListAdapter.ViewHolder> {
 
-    private Context mContext;
-    private ArrayList<MtbColr> mDataset;
+    private final Context mContext;
+    private final ArrayList<MtbColr> mDataset;
     private OnItemClickListener mOnItemClickListener;
 
 
@@ -60,7 +59,7 @@ public class BottomSheetFragmentLUContentListAdapter extends RecyclerView.Adapte
     @Override
     public BottomSheetFragmentLUContentListAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         // create a new view
-        BottomSheetFragmentLuContentListItemBinding viewDataBinding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.bottom_sheet_fragment__lu_content__list_item, parent, false);
+        BottomSheetFragmentLuContentListItemBinding viewDataBinding = BottomSheetFragmentLuContentListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
 
         return new BottomSheetFragmentLUContentListAdapter.ViewHolder(viewDataBinding);
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java
index 8ff3a4c6..61a8f461 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java
@@ -8,10 +8,12 @@ import java.math.RoundingMode;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 
 public class BottomSheetFragmentLUContentViewModel {
 
+
+
     public ObservableField<MtbColt> mtbColt = new ObservableField<>();
     public ObservableField<String> pesoKg = new ObservableField<>();
     public ObservableField<String> pesoNettoKg = new ObservableField<>();
@@ -22,6 +24,10 @@ public class BottomSheetFragmentLUContentViewModel {
         if (this.mListener != null) this.mListener.onBottomSheetLUClose();
     }
 
+    public void requestChangeMtbTcol() {
+        if (this.mListener != null) this.mListener.onRequestChangeMtbTcol(mtbColt.get());
+    }
+
     public BottomSheetFragmentLUContentViewModel setMtbColt(MtbColt mtbColt) {
         this.mtbColt.set(mtbColt);
         return this;
@@ -45,7 +51,7 @@ public class BottomSheetFragmentLUContentViewModel {
         MtbColt collo = this.mtbColt.get();
         if (collo == null) return;
 
-        MtbTCol tipoPedana = collo.getMtbTCol();
+        ObservableMtbTcol tipoPedana = collo.getMtbTCol();
         BigDecimal taraPedana = tipoPedana != null ? tipoPedana.getTaraKg() : BigDecimal.ZERO;
         BigDecimal pesoNetto = BigDecimal.ZERO;
 
@@ -67,6 +73,8 @@ public class BottomSheetFragmentLUContentViewModel {
     }
 
     public interface Listener {
+        void onRequestChangeMtbTcol(MtbColt mtbColt);
+
         void onBottomSheetLUClose();
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUModule.java
index 27bb2a77..50f815b9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUModule.java
@@ -2,14 +2,13 @@ package it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu;
 
 import dagger.Module;
 import dagger.Provides;
-import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 
 @Module(subcomponents = DialogInfoAggiuntiveLUComponent.class)
 public class DialogInfoAggiuntiveLUModule {
 
     @Provides
-    DialogInfoAggiuntiveLUViewModel providesDialogInfoAggiuntiveLUViewModel(ImballiRESTConsumer imballiRESTConsumer) {
-        return new DialogInfoAggiuntiveLUViewModel(imballiRESTConsumer);
+    DialogInfoAggiuntiveLUViewModel providesDialogInfoAggiuntiveLUViewModel() {
+        return new DialogInfoAggiuntiveLUViewModel();
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUView.java
index 3adbb8f6..75e95647 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUView.java
@@ -24,7 +24,7 @@ import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.utility.UtilityObservable;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.DialogInfoAggiuntiveLuBinding;
@@ -46,26 +46,38 @@ public class DialogInfoAggiuntiveLUView extends BaseDialogFragment implements Di
     private Context mContext;
 
 
-    private final RunnableArgss<String, MtbTCol> mOnComplete;
+    private final boolean askNotes;
+    private final boolean askTipoUl;
+    private final RunnableArgss<String, ObservableMtbTcol> mOnComplete;
     private final Runnable mOnAbort;
     private final MtbColt currentMtbColt;
 
 
-    public static DialogInfoAggiuntiveLUView newInstance(@NotNull RunnableArgss<String, MtbTCol> onComplete, @NotNull Runnable onAbort) {
-        return new DialogInfoAggiuntiveLUView(null, onComplete, onAbort);
+    public static DialogInfoAggiuntiveLUView newInstance(@NotNull RunnableArgss<String, ObservableMtbTcol> onComplete, @NotNull Runnable onAbort) {
+        return new DialogInfoAggiuntiveLUView(null, true, true, onComplete, onAbort);
     }
 
-    public static DialogInfoAggiuntiveLUView newInstance(MtbColt mtbColt, @NotNull RunnableArgss<String, MtbTCol> onComplete, @NotNull Runnable onAbort) {
-        return new DialogInfoAggiuntiveLUView(mtbColt, onComplete, onAbort);
+    public static DialogInfoAggiuntiveLUView newInstance(MtbColt mtbColt, boolean askNotes, boolean askTipoUl, @NotNull RunnableArgss<String, ObservableMtbTcol> onComplete, @NotNull Runnable onAbort) {
+        return new DialogInfoAggiuntiveLUView(mtbColt, askNotes, askTipoUl, onComplete, onAbort);
     }
 
-    private DialogInfoAggiuntiveLUView(MtbColt mtbColt, @NotNull RunnableArgss<String, MtbTCol> onComplete, @NotNull Runnable onAbort) {
+    private DialogInfoAggiuntiveLUView(MtbColt mtbColt, boolean askNotes, boolean askTipoUl, @NotNull RunnableArgss<String, ObservableMtbTcol> onComplete, @NotNull Runnable onAbort) {
         super();
         this.mOnComplete = onComplete;
         this.mOnAbort = onAbort;
         this.currentMtbColt = mtbColt;
+
+        this.askNotes = askNotes;
+        this.askTipoUl = askTipoUl;
     }
 
+    public boolean isAskNotes() {
+        return askNotes;
+    }
+
+    public boolean isAskTipoUl() {
+        return askTipoUl;
+    }
 
     @NonNull
     @Override
@@ -109,8 +121,8 @@ public class DialogInfoAggiuntiveLUView extends BaseDialogFragment implements Di
     public void onInit(DialogInterface dialogInterface) {
         super.onInit(dialogInterface);
 
-        this.init();
         this.mViewModel.init();
+        this.init();
     }
 
     private void init() {
@@ -123,15 +135,12 @@ public class DialogInfoAggiuntiveLUView extends BaseDialogFragment implements Di
 
         mBindings.filledExposedDropdownCodTcol.setAdapter(codTcolArrayAdapter);
 
-        this.mViewModel.getTipiCollo().observe(this, tipiCollo -> {
-
-            if (currentMtbColt != null && !UtilityString.isNullOrEmpty(currentMtbColt.getCodTcol()) && UtilityString.isNullOrEmpty(this.selectedMtbTcol.get())) {
-                tipiCollo.stream()
-                        .filter(x -> x.getCodTcol().equalsIgnoreCase(currentMtbColt.getCodTcol()))
-                        .findFirst()
-                        .ifPresent(tipoPedana -> this.selectedMtbTcol.set(tipoPedana.getCodTcol() + " - " + tipoPedana.getDescrizione()));
-            }
-        });
+        if (currentMtbColt != null && !UtilityString.isNullOrEmpty(currentMtbColt.getCodTcol()) && UtilityString.isNullOrEmpty(this.selectedMtbTcol.get())) {
+            mViewModel.getTipiCollo().getValue().stream()
+                    .filter(x -> x.getCodTcol().equalsIgnoreCase(currentMtbColt.getCodTcol()))
+                    .findFirst()
+                    .ifPresent(tipoPedana -> this.selectedMtbTcol.set(tipoPedana.getCodTcol() + " - " + tipoPedana.getDescrizione()));
+        }
 
 
         UtilityObservable.addPropertyChanged(this.selectedMtbTcol, (value) -> {
@@ -160,6 +169,5 @@ public class DialogInfoAggiuntiveLUView extends BaseDialogFragment implements Di
         });
 
 
-
     }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUViewModel.java
index 08710e40..29a255d8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUViewModel.java
@@ -2,38 +2,35 @@ package it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu;
 
 import androidx.lifecycle.MutableLiveData;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.model.MtbTCol;
-import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 
 public class DialogInfoAggiuntiveLUViewModel {
 
-    private final MutableLiveData<List<MtbTCol>> tipiCollo = new MutableLiveData<>();
+    private final MutableLiveData<List<ObservableMtbTcol>> tipiCollo = new MutableLiveData<>();
 
     private Listener mListener;
-    private final ImballiRESTConsumer imballiRESTConsumer;
 
     @Inject
-    public DialogInfoAggiuntiveLUViewModel(ImballiRESTConsumer imballiRESTConsumer) {
-        this.imballiRESTConsumer = imballiRESTConsumer;
+    public DialogInfoAggiuntiveLUViewModel() {
     }
 
 
     public void init() {
-        this.sendOnLoadingStarted();
-
-        imballiRESTConsumer.retrieveTipiCollo(MtbTCol.FlagUiUlEnum.UL, tipiCollo -> {
-            this.tipiCollo.postValue(tipiCollo == null ? new ArrayList<>() : tipiCollo);
-            this.sendOnLoadingEnded();
-        }, this::sendError);
+        var imballiList = SettingsManager.iDB().getInternalImballi().stream()
+                .filter(x -> x.getFlagUIUL() == MtbTCol.FlagUiUlEnum.UL)
+                .collect(Collectors.toUnmodifiableList());
+        this.tipiCollo.setValue(imballiList);
     }
 
-    public MutableLiveData<List<MtbTCol>> getTipiCollo() {
+    public MutableLiveData<List<ObservableMtbTcol>> getTipiCollo() {
         return tipiCollo;
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdResultDTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdResultDTO.java
index 4f60b0d9..820216d4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdResultDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdResultDTO.java
@@ -3,7 +3,7 @@ package it.integry.integrywmsnative.view.dialogs.input_lu_prod;
 import java.math.BigDecimal;
 
 import it.integry.integrywmsnative.core.model.JtbFasi;
-import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 
 public class DialogInputLUProdResultDTO {
 
@@ -14,7 +14,7 @@ public class DialogInputLUProdResultDTO {
     private BigDecimal taraCol;
     private BigDecimal pesoLordo;
 
-    private MtbTCol mtbTCol;
+    private ObservableMtbTcol mtbTCol;
     private JtbFasi jtbFasi;
 
 
@@ -72,11 +72,11 @@ public class DialogInputLUProdResultDTO {
         return this;
     }
 
-    public MtbTCol getMtbTCol() {
+    public ObservableMtbTcol getMtbTCol() {
         return mtbTCol;
     }
 
-    public DialogInputLUProdResultDTO setMtbTCol(MtbTCol mtbTCol) {
+    public DialogInputLUProdResultDTO setMtbTCol(ObservableMtbTcol mtbTCol) {
         this.mtbTCol = mtbTCol;
         return this;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
index a3dcd637..7c265541 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
@@ -40,7 +40,7 @@ import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.JtbFasi;
 import it.integry.integrywmsnative.core.model.MtbAart;
-import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.utility.UtilityObservable;
 import it.integry.integrywmsnative.databinding.DialogInputLuProdBinding;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
@@ -335,7 +335,7 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI
 
 
             if (mDialogInputLUProdDTO.getCodTcol() != null) {
-                Optional<MtbTCol> optTCol = Stream.of(tipiCollo)
+                java.util.Optional<ObservableMtbTcol> optTCol = tipiCollo.stream()
                         .filter(x -> x.getCodTcol().equalsIgnoreCase(mDialogInputLUProdDTO.getCodTcol()))
                         .findFirst();
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java
index 4f198759..df7c4b0f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java
@@ -12,6 +12,7 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
 import it.integry.integrywmsnative.core.model.JtbFasi;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
@@ -30,7 +31,7 @@ public class DialogInputLUProdViewModel {
     public ObservableField<Boolean> blockedTaraCol = new ObservableField<>(false);
     public ObservableField<Boolean> blockedPesoLordo = new ObservableField<>(false);
 
-    private final MutableLiveData<List<MtbTCol>> mTipiColloLiveData = new MutableLiveData<>();
+    private final MutableLiveData<List<ObservableMtbTcol>> mTipiColloLiveData = new MutableLiveData<>();
     private final MutableLiveData<List<JtbFasi>> mLineeProdLiveData = new MutableLiveData<>();
 
     private BigDecimal initialNumCnf;
@@ -43,7 +44,7 @@ public class DialogInputLUProdViewModel {
     private BigDecimal internalTaraCol;
     private BigDecimal internalPesoLordo;
 
-    private MtbTCol internalTipoPed;
+    private ObservableMtbTcol internalTipoPed;
     private JtbFasi internalLineaProd;
 
     private boolean isLineeProdRequired;
@@ -62,7 +63,7 @@ public class DialogInputLUProdViewModel {
     public void init(String codJfasParent) {
         this.sendOnLoadingStarted();
 
-        imballiRESTConsumer.retrieveTipiCollo(MtbTCol.FlagUiUlEnum.UL, tipiCollo -> {
+        imballiRESTConsumer.retrieveImballi(MtbTCol.FlagUiUlEnum.UL, tipiCollo -> {
             this.mTipiColloLiveData.postValue(tipiCollo);
 
             mMesRESTConsumer.getLineeProduzione(codJfasParent, jtbFasi -> {
@@ -76,7 +77,7 @@ public class DialogInputLUProdViewModel {
         }, this::sendError);
     }
 
-    public MutableLiveData<List<MtbTCol>> getTipiCollo() {
+    public MutableLiveData<List<ObservableMtbTcol>> getTipiCollo() {
         return this.mTipiColloLiveData;
     }
 
@@ -200,7 +201,7 @@ public class DialogInputLUProdViewModel {
         this.mListener.onDataChanged();
     }
 
-    public DialogInputLUProdViewModel setInternalTipoPed(MtbTCol internalTipoPed) {
+    public DialogInputLUProdViewModel setInternalTipoPed(ObservableMtbTcol internalTipoPed) {
         this.internalTipoPed = internalTipoPed;
         return this;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java
index c5e85b6e..4c0f3507 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java
@@ -6,35 +6,40 @@ import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
 
-import com.annimon.stream.Stream;
-
 import java.util.List;
+import java.util.stream.Collectors;
 
-import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 
 public class DialogInputLUProdTipoColloAdapter extends ArrayAdapter<DialogInputLUProdTipoColloListModel> {
 
     private List<DialogInputLUProdTipoColloListModel> mDataset;
 
-    public DialogInputLUProdTipoColloAdapter(@NonNull Context context, int resource, @NonNull MutableLiveData<List<MtbTCol>> inputData) {
+    public DialogInputLUProdTipoColloAdapter(@NonNull Context context, int resource, @NonNull MutableLiveData<List<ObservableMtbTcol>> inputData) {
         super(context, resource);
 
         inputData.observeForever(data -> {
-             mDataset = Stream.of(data)
+            mDataset = data.stream()
                     .map(x -> new DialogInputLUProdTipoColloListModel()
                             .setOriginalModel(x))
-                    .toList();
+                    .collect(Collectors.toList());
 
             clear();
             addAll(mDataset);
         });
+
+        if (inputData.getValue() != null)
+            mDataset = inputData.getValue().stream()
+                    .map(x -> new DialogInputLUProdTipoColloListModel()
+                            .setOriginalModel(x))
+                    .collect(Collectors.toList());
     }
 
     public List<DialogInputLUProdTipoColloListModel> getDataset() {
         return this.mDataset;
     }
 
-    public MtbTCol getOriginalModelItem(int position) {
+    public ObservableMtbTcol getOriginalModelItem(int position) {
         return mDataset.get(position).getOriginalModel();
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloListModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloListModel.java
index c6bb6ce9..4328b7e2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloListModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloListModel.java
@@ -2,17 +2,17 @@ package it.integry.integrywmsnative.view.dialogs.input_lu_prod.adapter;
 
 import org.jetbrains.annotations.NotNull;
 
-import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 
 public class DialogInputLUProdTipoColloListModel {
 
-    private MtbTCol originalModel;
+    private ObservableMtbTcol originalModel;
 
-    public MtbTCol getOriginalModel() {
+    public ObservableMtbTcol getOriginalModel() {
         return originalModel;
     }
 
-    public DialogInputLUProdTipoColloListModel setOriginalModel(MtbTCol originalModel) {
+    public DialogInputLUProdTipoColloListModel setOriginalModel(ObservableMtbTcol originalModel) {
         this.originalModel = originalModel;
         return this;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java
index da86ff71..ebbeb88f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java
@@ -9,12 +9,13 @@ import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -24,7 +25,9 @@ import it.integry.integrywmsnative.core.di.BindableString;
 import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
 import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.databinding.DialogInputPesoLuBinding;
@@ -47,7 +50,7 @@ public class DialogInputPesoLUView extends BaseDialogFragment {
     public BindableString grossWeight = new BindableString();
 
 
-    private List<MtbTCol> codTcolList = null;
+    private List<ObservableMtbTcol> codTcolList = null;
     private ArrayAdapter<String> codTcolArrayAdapter = null;
 
 
@@ -95,34 +98,31 @@ public class DialogInputPesoLUView extends BaseDialogFragment {
     }
 
 
-
     private void init() {
 
-        imballiRESTConsumer.retrieveTipiCollo(MtbTCol.FlagUiUlEnum.UL, codTcols -> {
-            this.codTcolList = codTcols;
+        this.codTcolList = SettingsManager.iDB().getInternalImballi().stream()
+                .filter(x -> x.getFlagUIUL() == MtbTCol.FlagUiUlEnum.UL)
+                .collect(Collectors.toUnmodifiableList());
 
-            List<String> codTcolDescriptions = Stream.of(codTcols)
+        List<String> codTcolDescriptions = codTcolList.stream()
+                .map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione())
+                .toList();
+
+        if (codTcol.get() != null) {
+            Optional<String> newCodTcol = this.codTcolList.stream()
+                    .filter(x -> x.getCodTcol().equalsIgnoreCase(codTcol.get()))
                     .map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione())
-                    .toList();
+                    .findFirst();
 
-            if(codTcol.get() != null) {
-                Optional<String> newCodTcol = Stream.of(codTcols)
-                        .filter(x -> x.getCodTcol().equalsIgnoreCase(codTcol.get()))
-                        .map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione())
-                        .findSingle();
+            if (newCodTcol.isPresent()) codTcol.set(newCodTcol.get());
+        }
 
-                if(newCodTcol.isPresent()) codTcol.set(newCodTcol.get());
-            }
-
-            codTcolArrayAdapter = new ArrayAdapter(requireContext(), R.layout.array_adapter_single_item);
-            codTcolArrayAdapter.addAll(codTcolDescriptions);
-            mBindings.filledExposedDropdownCodTcol.setAdapter(codTcolArrayAdapter);
+        codTcolArrayAdapter = new ArrayAdapter<>(requireContext(), R.layout.array_adapter_single_item);
+        codTcolArrayAdapter.addAll(codTcolDescriptions);
+        mBindings.filledExposedDropdownCodTcol.setAdapter(codTcolArrayAdapter);
 
 //            progressDialog.dismiss();
 
-        }, ex -> {
-            UtilityExceptions.defaultException(requireContext(), ex);
-        });
 
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiModule.java
index 37e35e76..d01ee5ad 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiModule.java
@@ -2,14 +2,13 @@ package it.integry.integrywmsnative.view.dialogs.tracciamento_imballi;
 
 import dagger.Module;
 import dagger.Provides;
-import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 
 @Module(subcomponents = DialogTracciamentoImballiComponent.class)
 public class DialogTracciamentoImballiModule {
 
     @Provides
-    DialogTracciamentoImballiViewModel providesDialogTracciamentoImballiViewModel(ImballiRESTConsumer imballiRESTConsumer) {
-        return new DialogTracciamentoImballiViewModel(imballiRESTConsumer);
+    DialogTracciamentoImballiViewModel providesDialogTracciamentoImballiViewModel() {
+        return new DialogTracciamentoImballiViewModel();
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiViewModel.java
index dcfdb4aa..e27a6d53 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiViewModel.java
@@ -7,33 +7,29 @@ import androidx.lifecycle.MutableLiveData;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.model.MtbTCol;
-import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 
 public class DialogTracciamentoImballiViewModel {
 
-    private final ImballiRESTConsumer imballiRESTConsumer;
-
     private final MutableLiveData<List<TracciamentoImballoDTO>> imballiRegistrati = new MutableLiveData<>(new ArrayList<>());
-    private final ObservableArrayList<MtbTCol> imballiDisponibili = new ObservableArrayList<>();
+    private final ObservableArrayList<ObservableMtbTcol> imballiDisponibili = new ObservableArrayList<>();
 
     private Listener mListener;
 
-    public DialogTracciamentoImballiViewModel(ImballiRESTConsumer imballiRESTConsumer) {
-        this.imballiRESTConsumer = imballiRESTConsumer;
+    public DialogTracciamentoImballiViewModel() {
     }
 
 
     public void init() {
-        this.imballiRESTConsumer.retrieveTipiCollo(MtbTCol.FlagUiUlEnum.UI, tipiCollo -> {
+        imballiDisponibili.addAll(SettingsManager.iDB().getInternalImballi().stream()
+                .filter(x -> x.getFlagUIUL() == MtbTCol.FlagUiUlEnum.UI)
+                .collect(Collectors.toUnmodifiableList()));
 
-            if (tipiCollo == null || tipiCollo.isEmpty())
-                return;
-
-            imballiDisponibili.addAll(tipiCollo);
-        }, this::sendError);
     }
 
 
@@ -41,7 +37,7 @@ public class DialogTracciamentoImballiViewModel {
         return imballiRegistrati;
     }
 
-    public ObservableArrayList<MtbTCol> getImballiDisponibili() {
+    public ObservableArrayList<ObservableMtbTcol> getImballiDisponibili() {
         return imballiDisponibili;
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/adapter/DialogTracciamentoImballi_TipoColloAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/adapter/DialogTracciamentoImballi_TipoColloAdapter.java
index a01e93e4..d0784fa4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/adapter/DialogTracciamentoImballi_TipoColloAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/adapter/DialogTracciamentoImballi_TipoColloAdapter.java
@@ -9,11 +9,11 @@ import com.annimon.stream.Stream;
 
 import java.util.List;
 
-import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 
 public class DialogTracciamentoImballi_TipoColloAdapter extends ArrayAdapter<DialogTracciamentoImballi_TipoColloAdapter.ListModel> {
 
-    public DialogTracciamentoImballi_TipoColloAdapter(@NonNull Context context, int resource, List<MtbTCol> inputData) {
+    public DialogTracciamentoImballi_TipoColloAdapter(@NonNull Context context, int resource, List<ObservableMtbTcol> inputData) {
         super(context, resource);
 
         if(inputData == null) return;
@@ -28,12 +28,12 @@ public class DialogTracciamentoImballi_TipoColloAdapter extends ArrayAdapter<Dia
 
     public static class ListModel {
 
-        private MtbTCol originalModel;
+        private ObservableMtbTcol originalModel;
 
-        public MtbTCol getOriginalModel() {
+        public ObservableMtbTcol getOriginalModel() {
             return originalModel;
         }
-        public ListModel setOriginalModel(MtbTCol originalModel) {
+        public ListModel setOriginalModel(ObservableMtbTcol originalModel) {
             this.originalModel = originalModel;
             return this;
         }
diff --git a/app/src/main/res/drawable/circle_background.xml b/app/src/main/res/drawable/circle_background.xml
new file mode 100644
index 00000000..74de3f7c
--- /dev/null
+++ b/app/src/main/res/drawable/circle_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="?attr/colorPrimaryContainer"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_round_business_24.xml b/app/src/main/res/drawable/ic_round_business_24.xml
new file mode 100644
index 00000000..c3b55a22
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_business_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,7L12,5c0,-1.1 -0.9,-2 -2,-2L4,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,9c0,-1.1 -0.9,-2 -2,-2h-8zM6,19L4,19v-2h2v2zM6,15L4,15v-2h2v2zM6,11L4,11L4,9h2v2zM6,7L4,7L4,5h2v2zM10,19L8,19v-2h2v2zM10,15L8,15v-2h2v2zM10,11L8,11L8,9h2v2zM10,7L8,7L8,5h2v2zM19,19h-7v-2h2v-2h-2v-2h2v-2h-2L12,9h7c0.55,0 1,0.45 1,1v8c0,0.55 -0.45,1 -1,1zM18,11h-2v2h2v-2zM18,15h-2v2h2v-2z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
index 5b594e49..77dcc4cb 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
@@ -24,509 +24,874 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/full_white"
         android:clickable="true"
         android:focusable="true">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/bottom_sheet"
+
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="#ffffffff"
-            android:orientation="vertical">
+            app:cardCornerRadius="8dp"
+            app:cardElevation="4dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.cardview.widget.CardView
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:cardCornerRadius="8dp"
-                app:cardElevation="4dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/white"
+                android:orientation="vertical">
 
-                <androidx.appcompat.widget.LinearLayoutCompat
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/title_layout"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@android:color/white"
-                    android:orientation="vertical">
+                    android:layout_height="66dp"
+                    android:background="@color/colorAccent"
+                    android:paddingStart="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="8dp"
+                    android:paddingBottom="8dp">
 
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/title_layout"
-                        android:layout_width="match_parent"
-                        android:layout_height="66dp"
+                    <View
+                        android:id="@+id/indicator_view"
+                        android:layout_width="24dp"
+                        android:layout_height="4dp"
+                        android:alpha="0.5"
+                        android:background="@drawable/badge_round_corner"
+                        android:backgroundTint="@android:color/white"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:background="@color/colorAccent"
-                        android:paddingStart="16dp"
-                        android:paddingTop="8dp"
-                        android:paddingEnd="8dp"
-                        android:paddingBottom="8dp">
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/indicator_view">
 
-
-                        <View
-                            android:id="@+id/indicator_view"
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:layout_width="24dp"
-                            android:layout_height="4dp"
-                            android:alpha="0.5"
-                            android:background="@drawable/badge_round_corner"
-                            android:backgroundTint="@android:color/white"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@color/colorAccent"
+                            android:layout_height="24dp"
+                            android:tint="@android:color/white"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@id/indicator_view">
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:srcCompat="@drawable/ic_box" />
 
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:tint="@android:color/white"
-                                app:layout_constraintBottom_toBottomOf="parent"
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/textview_art_counter"
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:textColor="@android:color/white"
+                            android:textStyle="bold"
+                            app:layout_constraintStart_toEndOf="@+id/imageView"
+                            tools:text="2" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/textview_art_description"
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="4dp"
+                            android:text="@string/article"
+                            android:textAllCaps="false"
+                            android:textColor="@android:color/white"
+                            android:textStyle="bold"
+                            app:layout_constraintStart_toEndOf="@+id/imageView" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_close_lu"
+                        style="@style/Button.DangerFull"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginRight="8dp"
+                        android:text="@string/action_close_ul"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/indicator_view"
+                        app:singleClick="@{() -> viewModel.closeCurrentLU()}"
+                        app:strokeColor="@color/red_600" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                <androidx.core.widget.NestedScrollView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@android:color/white">
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:padding="12dp">
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="horizontal">
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="vertical">
+                                    <!-- Header con Numero e Data -->
+                                    <com.google.android.material.chip.Chip
+                                        android:id="@+id/unit_number"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@{&quot;UL #&quot; + viewModel.mtbColt.numCollo.toString()}"
+                                        app:chipStrokeWidth="0dp"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:text="UL #89" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:id="@+id/date"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:drawablePadding="4dp"
+                                        android:text="@{viewModel.mtbColt.dataColloHumanLong}"
+                                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                                        app:layout_constraintBottom_toBottomOf="@id/unit_number"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintTop_toTopOf="@id/unit_number"
+                                        tools:text="20 Gen 2025" />
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                                <com.google.android.material.card.MaterialCardView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="8dp"
+                                    android:layout_marginStart="18dp"
+                                    app:cardElevation="0dp"
+                                    app:layout_constraintTop_toBottomOf="@id/client_card"
+                                    app:strokeWidth="0dp">
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="horizontal"
+                                        android:padding="12dp"
+                                        android:visibility="@{UtilityString.isNullOrEmpty(viewModel.mtbColt.posizione) ? View.GONE : View.VISIBLE}">
+
+                                        <androidx.appcompat.widget.LinearLayoutCompat
+                                            android:layout_width="0dp"
+                                            android:layout_height="wrap_content"
+                                            android:layout_weight="1"
+                                            android:orientation="vertical">
+
+                                            <androidx.appcompat.widget.AppCompatTextView
+                                                android:layout_width="wrap_content"
+                                                android:layout_height="wrap_content"
+                                                android:text="@{viewModel.mtbColt.posizione}"
+                                                android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
+                                                android:layout_gravity="end"
+                                                tools:text="ME1AL2" />
+
+                                            <androidx.appcompat.widget.AppCompatTextView
+                                                android:layout_width="wrap_content"
+                                                android:layout_height="wrap_content"
+                                                android:text="@string/position_text"
+                                                android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                                                android:textColor="?attr/colorOutline"
+                                                android:layout_gravity="end"/>
+
+                                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                                </com.google.android.material.card.MaterialCardView>
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            <com.google.android.material.card.MaterialCardView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="12dp"
+                                app:cardElevation="0dp"
+                                app:layout_constraintTop_toBottomOf="@id/unit_number"
+                                app:strokeWidth="0dp">
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="horizontal"
+                                    android:padding="12dp"
+                                    android:focusable="true"
+                                    android:clickable="true"
+                                    android:background="?attr/selectableItemBackground"
+                                    android:onClick="@{() -> viewModel.requestChangeMtbTcol()}">
+
+                                    <androidx.appcompat.widget.AppCompatImageView
+                                        android:layout_width="40dp"
+                                        android:layout_height="40dp"
+                                        android:background="@drawable/circle_background"
+                                        android:padding="8dp"
+                                        android:src="@drawable/ic_pallet"
+                                        app:tint="?attr/colorPrimary" />
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center_vertical"
+                                        android:layout_marginStart="12dp"
+                                        android:layout_weight="1"
+                                        android:orientation="vertical">
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            app:visibilityWhenNotNull="@{viewModel.mtbColt.mtbTcolProperty()}"
+                                            android:text="@{viewModel.mtbColt.mtbTcolProperty().descrizioneProperty()}"
+                                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                                            android:singleLine="true"
+                                            android:ellipsize="end"
+                                            tools:text="120x120 EPAL" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            app:visibilityWhenNull="@{viewModel.mtbColt.mtbTcolProperty()}"
+                                            android:text="Non indicata"
+                                            android:textColor="?attr/colorOutline"
+                                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                                            android:singleLine="true"
+                                            android:ellipsize="end" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@string/lu_type"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                                            android:textColor="?attr/colorOutline" />
+
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                            </com.google.android.material.card.MaterialCardView>
+
+                            <!-- Client Card -->
+                            <com.google.android.material.card.MaterialCardView
+                                android:id="@+id/client_card"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="8dp"
+                                app:cardElevation="0dp"
+                                app:layout_constraintTop_toBottomOf="@id/unit_number"
+                                app:strokeWidth="0dp">
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="horizontal"
+                                    android:padding="12dp"
+                                    android:visibility="@{UtilityString.isNullOrEmpty(viewModel.mtbColt.ragSocCliente) ? View.GONE : View.VISIBLE}">
+
+                                    <androidx.appcompat.widget.AppCompatImageView
+                                        android:layout_width="40dp"
+                                        android:layout_height="40dp"
+                                        android:background="@drawable/circle_background"
+                                        android:padding="8dp"
+                                        android:src="@drawable/ic_round_business_24"
+                                        app:tint="?attr/colorPrimary" />
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center_vertical"
+                                        android:layout_marginStart="12dp"
+                                        android:layout_weight="1"
+                                        android:orientation="vertical">
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{viewModel.mtbColt.ragSocCliente}"
+                                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                                            android:singleLine="true"
+                                            android:ellipsize="end"
+                                            tools:text="47TH PARALLEL LTD" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@string/customer"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                                            android:textColor="?attr/colorOutline" />
+
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                            </com.google.android.material.card.MaterialCardView>
+
+                            <!-- Weight Info -->
+                            <com.google.android.material.card.MaterialCardView
+                                android:id="@+id/weight_card"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="8dp"
+                                app:cardElevation="0dp"
+                                app:layout_constraintTop_toBottomOf="@id/client_card"
+                                app:strokeWidth="0dp">
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="horizontal"
+                                    android:padding="12dp"
+                                    android:visibility="@{UtilityString.isNullOrEmpty(viewModel.pesoNettoKg) ? View.GONE : View.VISIBLE}">
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:orientation="vertical">
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{viewModel.pesoNettoKg}"
+                                            android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
+                                            tools:text="0.00" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@string/net_weight"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                                            android:textColor="?attr/colorOutline" />
+
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                                    <View
+                                        android:layout_width="1dp"
+                                        android:layout_height="match_parent"
+                                        android:background="?attr/colorOutline" />
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="12dp"
+                                        android:layout_weight="1"
+                                        android:orientation="vertical">
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{viewModel.pesoKg}"
+                                            android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
+                                            tools:text="0.00" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@string/gross_weight"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                                            android:textColor="?attr/colorOutline" />
+
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                            </com.google.android.material.card.MaterialCardView>
+
+                            <!-- Prepared Info -->
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="16dp"
+                                android:visibility="@{UtilityString.isNullOrEmpty(viewModel.mtbColt.posizione) ? View.GONE : View.VISIBLE}"
                                 app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:srcCompat="@drawable/ic_box" />
+                                app:layout_constraintTop_toBottomOf="@id/weight_card">
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:drawablePadding="4dp"
+                                    android:text="@string/prepared_by_text"
+                                    android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                                    android:textColor="?attr/colorOutline" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{viewModel.mtbColt.preparatoDa}"
+                                    tools:text="nome utente"
+                                    android:layout_marginStart="4dp"
+                                    android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                                    android:textColor="?attr/colorOutline" />
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:visibility="gone">
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/textview_art_counter"
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/AppTheme.NewMaterial.Text"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold"
-                                app:layout_constraintStart_toEndOf="@+id/imageView"
-                                tools:text="2" />
+                                android:layout_marginStart="10dp"
+                                android:layout_marginTop="10dp"
+                                android:text="@string/details_text"
+                                android:textAllCaps="true"
+                                android:textColor="@android:color/black"
+                                android:textStyle="bold" />
 
-                            <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/textview_art_description"
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
-                                android:layout_width="wrap_content"
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginStart="4dp"
-                                android:text="@string/article"
-                                android:textAllCaps="false"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold"
-                                app:layout_constraintStart_toEndOf="@+id/imageView" />
+                                android:orientation="vertical"
+                                android:padding="15dp">
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline0"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="8dp"
+                                        android:text="@string/number_text"
+                                        android:textColor="@android:color/black"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline0"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:visibility="@{viewModel.mtbColt != null ? View.VISIBLE : View.GONE}"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline0"
+                                        app:layout_constraintTop_toTopOf="parent">
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{viewModel.mtbColt.numCollo.toString()}"
+                                            tools:text="TextView" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginStart="4dp"
+                                            android:text="(serie: "
+                                            android:textColor="#57535D" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{viewModel.mtbColt.serCollo}"
+                                            android:textColor="#57535D"
+                                            android:textStyle="bold"
+                                            tools:text="TextView" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text=")"
+                                            android:textColor="#57535D" />
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline1"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="8dp"
+                                        android:text="@string/date_text"
+                                        android:textColor="@android:color/black"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline1"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:text="@{viewModel.mtbColt.dataColloHumanLong}"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline1"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:text="TextView" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:visibility="@{UtilityString.isNullOrEmpty(viewModel.mtbColt.posizione) ? View.GONE : View.VISIBLE}">
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline2"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:id="@+id/articoli_in_collo_details_posizione"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="8dp"
+                                        android:text="@string/position_text"
+                                        android:textColor="@android:color/black"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:text="@{viewModel.mtbColt.posizione}"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline2"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:text="TextView" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline3"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="8dp"
+                                        android:text="@string/prepared_by_text"
+                                        android:textColor="@android:color/black"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline3"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:text="@{viewModel.mtbColt.preparatoDa}"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline3"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:text="TextView" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:visibility="@{UtilityString.isNullOrEmpty(viewModel.mtbColt.ragSocCliente) ? View.GONE : View.VISIBLE}"
+
+                                    >
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline4"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="8dp"
+                                        android:text="@string/customer"
+                                        android:textColor="@android:color/black"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline4"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:text="@{viewModel.mtbColt.ragSocCliente}"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline4"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:text="TextView" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:visibility="@{UtilityString.isNullOrEmpty(viewModel.pesoNettoKg) ? View.GONE : View.VISIBLE}">
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline5"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="8dp"
+                                        android:text="@string/net_weight"
+                                        android:textColor="@android:color/black"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline5"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:text="@{viewModel.pesoNettoKg}"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline5"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:text="TextView" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:visibility="@{UtilityString.isNullOrEmpty(viewModel.pesoKg)? View.GONE : View.VISIBLE}">
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline6"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="8dp"
+                                        android:text="@string/gross_weight"
+                                        android:textColor="@android:color/black"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline6"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:text="@{viewModel.pesoKg}"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline6"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:text="TextView" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline7"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="8dp"
+                                        android:text="@string/lu_type"
+                                        android:textColor="@android:color/black"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline7"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.AppCompatImageButton
+                                        android:id="@+id/edit_tipo_ul_button"
+                                        android:layout_width="18dp"
+                                        android:layout_height="18dp"
+                                        android:backgroundTint="@android:color/transparent"
+                                        android:src="@drawable/ic_edit_24dp"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline7"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:layout_marginStart="4dp"
+                                        android:orientation="horizontal"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toEndOf="@id/edit_tipo_ul_button"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        app:visibilityWhenNotNull="@{viewModel.mtbColt.mtbTcolProperty()}">
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{viewModel.mtbColt.mtbTcolProperty().codTcol}"
+                                            tools:text="Cod" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text=" - " />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:ellipsize="end"
+                                            android:singleLine="true"
+                                            android:text="@{viewModel.mtbColt.mtbTcolProperty().descrizione}"
+                                            tools:text="Descrizione" />
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/btn_close_lu"
-                            style="@style/Button.DangerFull"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginRight="8dp"
-                            android:text="@string/action_close_ul"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toBottomOf="@id/indicator_view"
-                            app:singleClick="@{() -> viewModel.closeCurrentLU()}"
-                            app:strokeColor="@color/red_600" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-                    <androidx.core.widget.NestedScrollView
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent">
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="1dp"
+                            android:background="#ededed" />
 
                         <androidx.appcompat.widget.LinearLayoutCompat
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="vertical">
 
-                            <LinearLayout
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="10dp"
+                                android:layout_marginTop="10dp"
+                                android:text="@string/already_read_articles"
+                                android:textAllCaps="true"
+                                android:textColor="@android:color/black"
+                                android:textStyle="bold" />
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:orientation="vertical">
+                                android:orientation="vertical"
+                                android:paddingTop="14dp">
 
-                                <TextView
-                                    style="@style/AppTheme.NewMaterial.Text"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginStart="10dp"
-                                    android:layout_marginTop="10dp"
-                                    android:text="@string/details_text"
-                                    android:textAllCaps="true"
-                                    android:textColor="@android:color/black"
-                                    android:textStyle="bold" />
-
-                                <LinearLayout
+                                <androidx.appcompat.widget.LinearLayoutCompat
                                     android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginTop="16dp"
+                                    android:layout_marginBottom="16dp"
+                                    android:gravity="center"
                                     android:orientation="vertical"
-                                    android:padding="15dp">
+                                    android:padding="16dp"
+                                    android:visibility="@{viewModel.mtbColt == null || viewModel.mtbColt.mtbColr.size() == 0 ? View.VISIBLE : View.GONE}">
 
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content">
+                                    <androidx.appcompat.widget.AppCompatImageView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:src="@drawable/ic_info_78dp"
+                                        android:tint="@color/empty_view_gray" />
 
-                                        <androidx.constraintlayout.widget.Guideline
-                                            android:id="@+id/guideline0"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:orientation="vertical"
-                                            app:layout_constraintGuide_percent="0.40" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
-                                            android:layout_width="0dp"
-                                            android:layout_height="wrap_content"
-                                            android:layout_marginStart="8dp"
-                                            android:text="@string/number_text"
-                                            android:textColor="@android:color/black"
-                                            app:layout_constraintEnd_toStartOf="@+id/guideline0"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent" />
-
-                                        <androidx.appcompat.widget.LinearLayoutCompat
-                                            android:layout_width="0dp"
-                                            android:layout_height="0dp"
-                                            android:visibility="@{viewModel.mtbColt != null ? View.VISIBLE : View.GONE}"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="@+id/guideline0"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <androidx.appcompat.widget.AppCompatTextView
-                                                style="@style/AppTheme.NewMaterial.Text.Small"
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="@{viewModel.mtbColt.numCollo.toString()}"
-                                                tools:text="TextView" />
-
-                                            <androidx.appcompat.widget.AppCompatTextView
-                                                style="@style/AppTheme.NewMaterial.Text.Small"
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:textColor="#57535D"
-                                                android:layout_marginStart="4dp"
-                                                android:text="(serie: " />
-
-                                            <androidx.appcompat.widget.AppCompatTextView
-                                                style="@style/AppTheme.NewMaterial.Text.Small"
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:textColor="#57535D"
-                                                android:text="@{viewModel.mtbColt.serCollo}"
-                                                android:textStyle="bold"
-                                                tools:text="TextView" />
-
-                                            <androidx.appcompat.widget.AppCompatTextView
-                                                style="@style/AppTheme.NewMaterial.Text.Small"
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:textColor="#57535D"
-                                                android:text=")" />
-                                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content">
-
-                                        <androidx.constraintlayout.widget.Guideline
-                                            android:id="@+id/guideline1"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:orientation="vertical"
-                                            app:layout_constraintGuide_percent="0.40" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
-                                            android:layout_width="0dp"
-                                            android:layout_height="wrap_content"
-                                            android:layout_marginStart="8dp"
-                                            android:text="@string/date_text"
-                                            android:textColor="@android:color/black"
-                                            app:layout_constraintEnd_toStartOf="@+id/guideline1"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
-                                            android:layout_width="0dp"
-                                            android:layout_height="0dp"
-                                            android:text="@{viewModel.mtbColt.dataColloHumanLong}"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="@+id/guideline1"
-                                            app:layout_constraintTop_toTopOf="parent"
-                                            tools:text="TextView" />
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:visibility="@{UtilityString.isNullOrEmpty(viewModel.mtbColt.posizione) ? View.GONE : View.VISIBLE}">
-
-                                        <androidx.constraintlayout.widget.Guideline
-                                            android:id="@+id/guideline2"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:orientation="vertical"
-                                            app:layout_constraintGuide_percent="0.40" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            android:id="@+id/articoli_in_collo_details_posizione"
-                                            android:layout_width="0dp"
-                                            android:layout_height="wrap_content"
-                                            android:layout_marginStart="8dp"
-                                            android:text="@string/position_text"
-                                            android:textColor="@android:color/black"
-                                            app:layout_constraintEnd_toStartOf="@+id/guideline2"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
-                                            android:layout_width="0dp"
-                                            android:layout_height="0dp"
-                                            android:text="@{viewModel.mtbColt.posizione}"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="@+id/guideline2"
-                                            app:layout_constraintTop_toTopOf="parent"
-                                            tools:text="TextView" />
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content">
-
-                                        <androidx.constraintlayout.widget.Guideline
-                                            android:id="@+id/guideline3"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:orientation="vertical"
-                                            app:layout_constraintGuide_percent="0.40" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            android:layout_width="0dp"
-                                            android:layout_height="wrap_content"
-                                            android:layout_marginStart="8dp"
-                                            android:text="@string/prepared_by_text"
-                                            android:textColor="@android:color/black"
-                                            app:layout_constraintEnd_toStartOf="@+id/guideline3"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
-                                            android:layout_width="0dp"
-                                            android:layout_height="0dp"
-                                            android:text="@{viewModel.mtbColt.preparatoDa}"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="@+id/guideline3"
-                                            app:layout_constraintTop_toTopOf="parent"
-                                            tools:text="TextView" />
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:visibility="@{UtilityString.isNullOrEmpty(viewModel.mtbColt.ragSocCliente) ? View.GONE : View.VISIBLE}"
-
-                                        >
-
-                                        <androidx.constraintlayout.widget.Guideline
-                                            android:id="@+id/guideline4"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:orientation="vertical"
-                                            app:layout_constraintGuide_percent="0.40" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            android:layout_width="0dp"
-                                            android:layout_height="wrap_content"
-                                            android:layout_marginStart="8dp"
-                                            android:text="@string/customer"
-                                            android:textColor="@android:color/black"
-                                            app:layout_constraintEnd_toStartOf="@+id/guideline4"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
-                                            android:layout_width="0dp"
-                                            android:layout_height="0dp"
-                                            android:text="@{viewModel.mtbColt.ragSocCliente}"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="@+id/guideline4"
-                                            app:layout_constraintTop_toTopOf="parent"
-                                            tools:text="TextView" />
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:visibility="@{UtilityString.isNullOrEmpty(viewModel.pesoNettoKg) ? View.GONE : View.VISIBLE}">
-
-                                        <androidx.constraintlayout.widget.Guideline
-                                            android:id="@+id/guideline5"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:orientation="vertical"
-                                            app:layout_constraintGuide_percent="0.40" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            android:layout_width="0dp"
-                                            android:layout_height="wrap_content"
-                                            android:layout_marginStart="8dp"
-                                            android:text="@string/net_weight"
-                                            android:textColor="@android:color/black"
-                                            app:layout_constraintEnd_toStartOf="@+id/guideline5"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
-                                            android:layout_width="0dp"
-                                            android:layout_height="0dp"
-                                            android:text="@{viewModel.pesoNettoKg}"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="@+id/guideline5"
-                                            app:layout_constraintTop_toTopOf="parent"
-                                            tools:text="TextView" />
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:visibility="@{UtilityString.isNullOrEmpty(viewModel.pesoKg)? View.GONE : View.VISIBLE}">
-
-                                        <androidx.constraintlayout.widget.Guideline
-                                            android:id="@+id/guideline6"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:orientation="vertical"
-                                            app:layout_constraintGuide_percent="0.40" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            android:layout_width="0dp"
-                                            android:layout_height="wrap_content"
-                                            android:layout_marginStart="8dp"
-                                            android:text="@string/gross_weight"
-                                            android:textColor="@android:color/black"
-                                            app:layout_constraintEnd_toStartOf="@+id/guideline6"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
-                                            android:layout_width="0dp"
-                                            android:layout_height="0dp"
-                                            app:binding="@{viewModel.pesoKg}"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="@+id/guideline6"
-                                            app:layout_constraintTop_toTopOf="parent"
-                                            tools:text="TextView" />
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-                                </LinearLayout>
-
-
-                            </LinearLayout>
-
-                            <View
-                                android:layout_width="match_parent"
-                                android:layout_height="1dp"
-                                android:layout_marginTop="24dp"
-                                android:background="#ededed" />
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    style="@style/AppTheme.NewMaterial.Text"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginStart="10dp"
-                                    android:layout_marginTop="10dp"
-                                    android:text="@string/already_read_articles"
-                                    android:textAllCaps="true"
-                                    android:textColor="@android:color/black"
-                                    android:textStyle="bold" />
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="vertical"
-                                    android:paddingTop="14dp">
-
-                                    <LinearLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="match_parent"
-                                        android:layout_marginTop="16dp"
-                                        android:layout_marginBottom="16dp"
                                         android:gravity="center"
-                                        android:orientation="vertical"
-                                        android:padding="16dp"
-                                        android:visibility="@{viewModel.mtbColt == null || viewModel.mtbColt.mtbColr.size() == 0 ? View.VISIBLE : View.GONE}">
+                                        android:text="@string/empty_rows_in_mtbcolt"
+                                        android:textColor="@color/empty_view_gray"
+                                        android:textSize="20sp" />
 
-                                        <androidx.appcompat.widget.AppCompatImageView
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:src="@drawable/ic_info_78dp"
-                                            android:tint="@color/empty_view_gray" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text"
-                                            android:layout_width="match_parent"
-                                            android:layout_height="wrap_content"
-                                            android:gravity="center"
-                                            android:text="@string/empty_rows_in_mtbcolt"
-                                            android:textColor="@color/empty_view_gray"
-                                            android:textSize="20sp" />
-
-                                    </LinearLayout>
+                                </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-                                    <androidx.recyclerview.widget.RecyclerView
-                                        android:id="@+id/mtb_colr_recycler_view"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:clickable="true"
-                                        android:focusable="true"
-                                        app:dividerThickness="0.5dp" />
+                                <androidx.recyclerview.widget.RecyclerView
+                                    android:id="@+id/mtb_colr_recycler_view"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:clickable="true"
+                                    android:focusable="true"
+                                    app:dividerThickness="0.5dp" />
 
 
-                                </LinearLayout>
+                            </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-                            </LinearLayout>
                         </androidx.appcompat.widget.LinearLayoutCompat>
+                    </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-                    </androidx.core.widget.NestedScrollView>
+                </androidx.core.widget.NestedScrollView>
 
-                </androidx.appcompat.widget.LinearLayoutCompat>
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
-            </androidx.cardview.widget.CardView>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
index 86e9c332..7fa714e0 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
@@ -7,6 +7,8 @@
 
         <import type="android.view.View" />
 
+        <import type="it.integry.integrywmsnative.core.helper.GestioneToTextConverter" />
+
         <import type="it.integry.integrywmsnative.core.utility.UtilityDate.COMMONS_DATE_FORMATS" />
 
         <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
@@ -137,187 +139,73 @@
             </RelativeLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-
-        <RelativeLayout
-            android:layout_width="match_parent"
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/new_card"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
+            android:layout_marginTop="8dp"
             android:visibility="@{mtbColr.numColloRif != null ? View.VISIBLE : View.GONE}"
+            android:focusable="false"
+            android:clickable="false"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/art_detail">
+            app:layout_constraintTop_toBottomOf="@id/art_detail"
+            app:cardElevation="0dp"
+            app:strokeWidth="0dp">
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:background="@drawable/badge_round_corner"
-                android:backgroundTint="@color/green_600"
                 android:orientation="horizontal"
-                android:padding="2dp">
+                android:padding="12dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:background="@drawable/circle_background"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_box"
+                    app:tint="?attr/colorPrimary" />
 
                 <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/badge_round_corner"
-                    android:backgroundTint="@android:color/white"
-                    android:orientation="horizontal"
-                    android:padding="0dp">
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="12dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:paddingStart="2dp"
-                        android:paddingEnd="4dp">
+                        android:text="@{&quot;#&quot; + mtbColr.numColloRif + &quot; (&quot; + mtbColr.serCollo + &quot;)&quot;}"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:singleLine="true"
+                        android:ellipsize="end"
+                        tools:text="#5230 (/)" />
 
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/image"
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginStart="8dp"
-                            android:layout_marginTop="8dp"
-                            android:layout_marginEnd="8dp"
-                            android:layout_marginBottom="8dp"
-                            android:src="@drawable/ic_box"
-                            android:tint="@color/green_600" />
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{GestioneToTextConverter.convert(mtbColr.gestioneEnum)}"
+                        android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                        android:textColor="?attr/colorOutline"
+                        tools:text="Lavorazione"/>
 
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/refs_title"
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="Prelevato da"
-                            android:textColor="@color/green_600"
-                            android:textStyle="bold" />
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:layout_width="2dp"
-                        android:layout_height="match_parent"
-                        android:background="@color/green_600" />
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal"
-                        android:padding="10dp"
-                        android:weightSum="2">
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:orientation="horizontal">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Num: "
-                                    android:textColor="@android:color/black" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="@{mtbColr.numColloRif.toString()}"
-                                    android:textColor="@android:color/black"
-                                    android:textStyle="bold"
-                                    tools:text="5230" />
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="2dp"
-                                android:orientation="horizontal">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Gest: "
-                                    android:textColor="@android:color/black" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="@{mtbColr.gestioneRif}"
-                                    android:textColor="@android:color/black"
-                                    android:textStyle="bold"
-                                    tools:text="V" />
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="0"
-                            android:orientation="vertical">
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:orientation="horizontal">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Data: "
-                                    android:textColor="@android:color/black" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="@{UtilityDate.formatDate(mtbColr.dataColloRifD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
-                                    android:textColor="@android:color/black"
-                                    android:textStyle="bold"
-                                    tools:text="02 mar 2020" />
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="2dp"
-                                android:orientation="horizontal">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Serie: "
-                                    android:textColor="@android:color/black" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="@{mtbColr.serColloRif}"
-                                    android:textColor="@android:color/black"
-                                    android:textStyle="bold"
-                                    tools:text="UL" />
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
                 </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{UtilityDate.formatDate(mtbColr.dataColloRifD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    tools:text="20 gennaio 2025" />
             </androidx.appcompat.widget.LinearLayoutCompat>
 
+        </com.google.android.material.card.MaterialCardView>
 
-        </RelativeLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml b/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml
index 9ff6a54d..a619be5a 100644
--- a/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml
+++ b/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml
@@ -53,7 +53,7 @@
                 android:layout_marginTop="8dp"
                 app:layout_constraintTop_toBottomOf="@id/title_text"
                 app:layout_constraintBottom_toTopOf="@id/level_number_layout"
-                android:visibility="@{viewModel.tipiCollo == null || viewModel.tipiCollo.empty ? View.GONE : View.VISIBLE}"
+                app:visibility="@{view.askTipoUl}"
                 android:hint="@string/lu_type">
 
                 <androidx.appcompat.widget.AppCompatAutoCompleteTextView
@@ -76,6 +76,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
+                app:visibility="@{view.askNotes}"
                 app:layout_constraintTop_toBottomOf="@id/input_cod_tcol">
 
                 <com.google.android.material.textfield.TextInputEditText
diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita.xml b/app/src/main/res/layout/fragment_main_ordini_uscita.xml
index 6177fe22..3accde27 100644
--- a/app/src/main/res/layout/fragment_main_ordini_uscita.xml
+++ b/app/src/main/res/layout/fragment_main_ordini_uscita.xml
@@ -21,8 +21,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
-        tools:context=".gest.vendita.MainVenditaFragment">
+        android:background="@android:color/white">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
@@ -33,8 +32,7 @@
                 android:id="@+id/filter_chips"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:scrollbars="none"
-                android:background="@color/gray_050">
+                android:scrollbars="none">
 
                 <com.google.android.material.chip.ChipGroup
                     android:id="@+id/filter_chips_group"
diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml
index 4eab508c..f15a6039 100644
--- a/app/src/main/res/values/config.xml
+++ b/app/src/main/res/values/config.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <item name="bound_observable" type="id" />
+    <item name="bound_observable_visibility" type="id" />
     <item name="bound_reverse_visibility" type="id" />
 
 

From 8e0b05b6afd140f110ad60b96b0af2ab27de2500 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 20 Jan 2025 17:57:54 +0100
Subject: [PATCH 085/103] -> v1.43.00 (465)

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

diff --git a/app/build.gradle b/app/build.gradle
index a41dbf6d..1d2a9a68 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 464
-    def appVersionName = '1.42.04'
+    def appVersionCode = 465
+    def appVersionName = '1.43.00'
 
     signingConfigs {
         release {

From 75f55ebd4482ec2689919fd0e3806a61acef624c Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 21 Jan 2025 13:05:14 +0100
Subject: [PATCH 086/103] Fix null point in retrieveImballiSyncronized

---
 .../core/rest/consumers/ImballiRESTConsumer.java                | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java
index c789f5ce..9170d032 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java
@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 
@@ -32,6 +33,7 @@ public class ImballiRESTConsumer extends _BaseRESTConsumer {
                 .execute();
 
         List<MtbTCol> retrieveTipiCollo = analyzeAnswer(response, "retrieveTipiCollo");
+        retrieveTipiCollo = retrieveTipiCollo == null ? new ArrayList<>() : retrieveTipiCollo;
         return MtbTcolMapper.fromDTOList(retrieveTipiCollo);
     }
 

From dc24b4331133fb11bfd8606124960465de83bacc Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 21 Jan 2025 13:07:06 +0100
Subject: [PATCH 087/103] -> v1.43.01 (466)

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

diff --git a/app/build.gradle b/app/build.gradle
index 1d2a9a68..46a2adbf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 465
-    def appVersionName = '1.43.00'
+    def appVersionCode = 466
+    def appVersionName = '1.43.01'
 
     signingConfigs {
         release {

From 9b451ff1bc653e27d7131d11b32e855c481785db Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 22 Jan 2025 10:30:16 +0100
Subject: [PATCH 088/103] Merge

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

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java
index 9999e6bb..fff38162 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java
@@ -3,7 +3,7 @@ package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail;
 import java.math.BigDecimal;
 
 import it.integry.integrywmsnative.core.model.JtbFasi;
-import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 
 public class ProdRientroMerceOrderDetailPickedQuantityDTO {
 

From a046e31412aefa13f28eedcbe0ffb9263ac77be6 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 24 Jan 2025 18:09:27 +0100
Subject: [PATCH 089/103] Migliorati errori letti dalle chiamate REST

---
 .../core/ean128/Ean128Service.java            |   6 +-
 .../core/menu/MenuRESTConsumer.java           |  10 +-
 .../integrywmsnative/core/model/MtbDepo.java  |   2 +-
 .../integrywmsnative/core/model/VtbDest.java  |   2 +-
 .../rest/consumers/ArticoloRESTConsumer.java  |  46 +++----
 .../rest/consumers/AziendaRESTConsumer.java   |  10 +-
 .../ColliAccettazioneRESTConsumer.java        |  40 +++---
 .../ColliLavorazioneRESTConsumer.java         |  70 +++++------
 .../consumers/ColliMagazzinoRESTConsumer.java | 114 +++++++++---------
 .../ColliSpedizioneRESTConsumer.java          |  36 +++---
 .../rest/consumers/DocumentRESTConsumer.java  |  27 ++---
 .../rest/consumers/EntityRESTConsumer.java    |  27 ++---
 .../rest/consumers/GestSetupRESTConsumer.java |  28 ++---
 .../rest/consumers/GiacenzaRESTConsumer.java  |  28 +++--
 .../consumers/InventarioRESTConsumer.java     |  20 +--
 .../MagazzinoAutomaticoRESTConsumer.java      |  16 +--
 .../MagazzinoBufferRESTConsumer.java          |  22 ++--
 .../rest/consumers/MagazzinoRESTConsumer.java |  15 ++-
 .../core/rest/consumers/MesRESTConsumer.java  |  24 ++--
 .../rest/consumers/OrdiniRESTConsumer.java    |  25 ++--
 .../PVOrdiniAcquistoRESTConsumer.java         |  25 ++--
 .../rest/consumers/PosizioniRESTConsumer.java |  10 +-
 .../rest/consumers/PrinterRESTConsumer.java   |  46 +++----
 .../ProductionLinesRESTConsumer.java          |  34 +++---
 .../consumers/ProduzioneRESTConsumer.java     |  11 +-
 .../rest/consumers/SystemRESTConsumer.java    |  43 +++----
 .../rest/handler/ManagedErrorCallback.java    |  27 +++++
 .../integrywmsnative/core/settings/Stash.java |   2 +-
 .../core/utility/UtilityLiveData.java         |   2 +-
 .../core/utility/UtilityString.java           |   2 +-
 .../rest/BolleAccettazioneRESTConsumer.java   |  16 +--
 .../AccettazioneBollaPickingRESTConsumer.java |  12 +-
 .../rest/OrdiniAccettazioneRESTConsumer.java  |  18 +--
 ...AccettazioneOrdiniPickingRESTConsumer.java |  10 +-
 .../rest/DocInterniRESTConsumer.java          |  15 ++-
 .../gest/login/rest/LoginRESTConsumer.java    |  20 ++-
 .../rest/OrdiniUscitaElencoRESTConsumer.java  |  10 +-
 .../ProdOrdineProduzioneRESTConsumer.java     |  18 +--
 .../ProdFabbisognoLineeProdRESTConsumer.java  |  12 +-
 .../ProdRientroMerceOrderDetailFragment.java  |  17 ++-
 ...odRientroMerceOrderDetailRESTConsumer.java |  18 ++-
 .../rest/RettificaGiacenzeRESTConsumer.java   |  22 ++--
 .../RecyclerViewScrollListener.java           |   4 -
 .../TracciamentoImballoDTO.java               |   2 +-
 ...agment_prod_rientro_merce_order_detail.xml |   1 +
 ..._sheet_fragment__lu_content__list_item.xml |   4 +-
 ...agment_prod_rientro_merce_order_detail.xml |   1 +
 app/src/main/res/values-it/strings.xml        |   4 +-
 .../HoneyWellBarcodeReader.java               |   2 +-
 49 files changed, 498 insertions(+), 478 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/handler/ManagedErrorCallback.java

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java b/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java
index 9286180c..c5405de0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java
@@ -228,13 +228,13 @@ public class Ean128Service {
                         case SHIP_TO_POST -> model.ShipToPost = aiValue.toString();
                         case SHIP_TO_POST_ISO ->
                                 model.ShipToPostISO = convertToIsoValueModel(aiValue.toString(), 0,
-                                        new Callable<String, String>() {
+                                        new Callable<>() {
                                             @Override
                                             public String call(String input) {
                                                 return input;
                                             }
                                         },
-                                        new CallableII<String, Integer, String>() {
+                                        new CallableII<>() {
                                             @Override
                                             public String call(String input, Integer input2) {
                                                 return input;
@@ -300,7 +300,7 @@ public class Ean128Service {
 
         T value = castFunc.call(splitFunc.call(sourceString.substring(3), numberOfDecimalDigits));
 
-        Ean128ISOValueModel<T> isoModel = new Ean128ISOValueModel<T>();
+        Ean128ISOValueModel<T> isoModel = new Ean128ISOValueModel<>();
         isoModel.ISOCode = isoCode;
         isoModel.Value = value;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/menu/MenuRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/menu/MenuRESTConsumer.java
index 3d773ddf..c71503f9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/menu/MenuRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/menu/MenuRESTConsumer.java
@@ -1,14 +1,16 @@
 package it.integry.integrywmsnative.core.menu;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.StbMenu;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -16,15 +18,15 @@ public class MenuRESTConsumer extends _BaseRESTConsumer {
 
     public void retrieveMenu(String rootCodOpz, RunnableArgs<StbMenu> onComplete, RunnableArgs<Exception> onFailed) {
         MenuRESTConsumerService menuRESTConsumerService = RESTBuilder.getService(MenuRESTConsumerService.class);
-        menuRESTConsumerService.retrieveMenuConfig(rootCodOpz).enqueue(new Callback<>() {
+        menuRESTConsumerService.retrieveMenuConfig(rootCodOpz).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<StbMenu>> call, Response<ServiceRESTResponse<StbMenu>> response) {
                 analyzeAnswer(response, "retrieveMenu", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<StbMenu>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<StbMenu>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepo.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepo.java
index bc720675..2c55daee 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepo.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepo.java
@@ -103,7 +103,7 @@ public class MtbDepo extends EntityBase implements Parcelable {
         return 0;
     }
 
-    public static final Creator<MtbDepo> CREATOR = new Creator<MtbDepo>() {
+    public static final Creator<MtbDepo> CREATOR = new Creator<>() {
         @Override
         public MtbDepo createFromParcel(Parcel in) {
             return new MtbDepo(in);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/VtbDest.java b/app/src/main/java/it/integry/integrywmsnative/core/model/VtbDest.java
index 45efd882..802c244c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/VtbDest.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/VtbDest.java
@@ -55,7 +55,7 @@ public class VtbDest extends EntityBase implements Parcelable {
         return 0;
     }
 
-    public static final Creator<VtbDest> CREATOR = new Creator<VtbDest>() {
+    public static final Creator<VtbDest> CREATOR = new Creator<>() {
         @Override
         public VtbDest createFromParcel(Parcel in) {
             return new VtbDest(in);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
index 87db9581..4a326dd3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import com.annimon.stream.Stream;
 import com.google.gson.reflect.TypeToken;
 
@@ -17,6 +19,7 @@ import it.integry.integrywmsnative.core.model.MtbGrup;
 import it.integry.integrywmsnative.core.model.MtbUntMis;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.articolo.ArticoloDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.RetrieveArticoloByCodMartRequestDTO;
@@ -27,7 +30,6 @@ import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarc
 import it.integry.integrywmsnative.core.rest.model.articolo.UpdateBarcodeImballoRequestDTO;
 import it.integry.integrywmsnative.core.utility.UtilityQuery;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -44,15 +46,15 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
         ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
         articoloRESTConsumerService
                 .retrieveAvailableUntMis()
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<MtbUntMis>> call, Response<ServiceRESTResponse<MtbUntMis>> response) {
                         analyzeAnswerList(response, "retrieveAvailableUntMis", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<MtbUntMis>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<MtbUntMis>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -61,15 +63,15 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
         ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
         articoloRESTConsumerService
                 .retrieveAvailableGruppiMerceologici()
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<MtbGrup>> call, Response<ServiceRESTResponse<MtbGrup>> response) {
                         analyzeAnswerList(response, "retrieveAvailableGruppiMerceologici", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<MtbGrup>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<MtbGrup>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -83,7 +85,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
         articoloRESTConsumerService
                 .searchByBarcode(request)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> call, Response<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> response) {
                         analyzeAnswer(response, "searchByBarcode", (m) -> {
@@ -92,8 +94,8 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -114,15 +116,15 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
         articoloRESTConsumer
                 .getByCodMart(new RetrieveArticoloByCodMartRequestDTO()
                         .setCodMarts(codMarts))
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<MtbAart>>> call, Response<ServiceRESTResponse<List<MtbAart>>> response) {
                         analyzeAnswer(response, "getByCodMart", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<MtbAart>>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<List<MtbAart>>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
@@ -131,15 +133,15 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
     public void getStatoPartita(String codMart, String partitaMag, RunnableArgs<List<StatoArticoloDTO>> onComplete, RunnableArgs<Exception> onFailed) {
 
         ArticoloRESTConsumerService articoloRESTConsumer = RESTBuilder.getService(ArticoloRESTConsumerService.class);
-        articoloRESTConsumer.getStatoPartita(codMart, partitaMag).enqueue(new Callback<>() {
+        articoloRESTConsumer.getStatoPartita(codMart, partitaMag).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<StatoArticoloDTO>>> call, Response<ServiceRESTResponse<List<StatoArticoloDTO>>> response) {
                 analyzeAnswer(response, "getStatoPartita", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<StatoArticoloDTO>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<StatoArticoloDTO>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
 
@@ -229,7 +231,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
         articoloRESTConsumerService
                 .updateBarcodeImballo(request)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "updateBarcodeImballo", m -> {
@@ -238,8 +240,8 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -253,7 +255,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
         articoloRESTConsumerService
                 .saveArticolo(request)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<SaveArticoloResponseDTO>> call, Response<ServiceRESTResponse<SaveArticoloResponseDTO>> response) {
                         analyzeAnswer(response, "saveArticolo", data -> {
@@ -262,8 +264,8 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<SaveArticoloResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<SaveArticoloResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/AziendaRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/AziendaRESTConsumer.java
index b994b3db..8e723108 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/AziendaRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/AziendaRESTConsumer.java
@@ -1,13 +1,15 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.Azienda;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -15,15 +17,15 @@ public class AziendaRESTConsumer extends _BaseRESTConsumer {
 
     public void retrieveAzienda(RunnableArgs<Azienda> onComplete, RunnableArgs<Exception> onFailed) {
         AziendaRESTConsumerService aziendaRESTConsumerService = RESTBuilder.getService(AziendaRESTConsumerService.class);
-        aziendaRESTConsumerService.retrieveDefaultAzienda().enqueue(new Callback<>() {
+        aziendaRESTConsumerService.retrieveDefaultAzienda().enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<Azienda>> call, Response<ServiceRESTResponse<Azienda>> response) {
                 analyzeAnswer(response, "Retrieve default azienda", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<Azienda>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<Azienda>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java
index dc07ca34..cf56f02f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -7,6 +9,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliCaricoRESTConsumerInterface;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCResponseDTO;
@@ -18,7 +21,6 @@ import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowResponseDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -28,15 +30,15 @@ public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements
         ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
 
         colliAccettazioneRESTConsumerService.createUDC(createUDCRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, Response<ServiceRESTResponse<CreateUDCResponseDTO>> response) {
                         analyzeAnswer(response, "accettazione/createUDC", data -> onComplete.run(data.getMtbColt()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
@@ -47,15 +49,15 @@ public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements
         ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
 
         colliAccettazioneRESTConsumerService.closeUDC(closeUDCRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, Response<ServiceRESTResponse<CloseUDCResponseDTO>> response) {
                         analyzeAnswer(response, "accettazione/closeUDC", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -65,15 +67,15 @@ public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements
         ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
 
         colliAccettazioneRESTConsumerService.insertUDCRow(insertUDCRowRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, Response<ServiceRESTResponse<InsertUDCRowResponseDTO>> response) {
                         analyzeAnswer(response, "accettazione/insertUDCRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -83,15 +85,15 @@ public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements
         ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
 
         colliAccettazioneRESTConsumerService.editUDCRow(editUDCRowRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, Response<ServiceRESTResponse<EditUDCRowResponseDTO>> response) {
                         analyzeAnswer(response, "accettazione/editUDCRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -101,15 +103,15 @@ public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements
         ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
 
         colliAccettazioneRESTConsumerService.deleteUDCRow(deleteUDCRowRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "accettazione/deleteUDCRow", data -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -118,15 +120,15 @@ public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements
         ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
 
         colliAccettazioneRESTConsumerService.checkIfBarcodeUlAlreadyRegistered(barcodeUl)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
                         analyzeAnswer(response, "accettazione/checkIfBarcodeUlAlreadyRegistered", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java
index 0decfd3a..e4b568ed 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import java.math.BigDecimal;
 
 import javax.inject.Singleton;
@@ -12,6 +14,7 @@ import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliCaricoRESTConsumerInterface;
 import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliScaricoRESTConsumerInterface;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCResponseDTO;
@@ -34,7 +37,6 @@ import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -52,15 +54,15 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
         colliLavorazioneRESTConsumerService.createUDC(createUDCRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, Response<ServiceRESTResponse<CreateUDCResponseDTO>> response) {
                         analyzeAnswer(response, "lavorazione/createUDC", data -> onComplete.run(data.getMtbColt()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -70,15 +72,15 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
         colliLavorazioneRESTConsumerService.closeUDC(closeUDCRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, Response<ServiceRESTResponse<CloseUDCResponseDTO>> response) {
                         analyzeAnswer(response, "lavorazione/closeUDC", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -88,15 +90,15 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
         colliLavorazioneRESTConsumerService.insertUDCRow(insertUDCRowRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, Response<ServiceRESTResponse<InsertUDCRowResponseDTO>> response) {
                         analyzeAnswer(response, "lavorazione/insertUDCRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -106,15 +108,15 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
         colliLavorazioneRESTConsumerService.editUDCRow(editUDCRowRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, Response<ServiceRESTResponse<EditUDCRowResponseDTO>> response) {
                         analyzeAnswer(response, "lavorazione/editUDCRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -123,15 +125,15 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
         colliLavorazioneRESTConsumerService.createUDS(createUDSRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<CreateUDSResponseDTO>> call, Response<ServiceRESTResponse<CreateUDSResponseDTO>> response) {
                         analyzeAnswer(response, "lavorazione/createUDS", data -> onComplete.run(data.getMtbColt()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<CreateUDSResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<CreateUDSResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
@@ -142,15 +144,15 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
         colliLavorazioneRESTConsumerService.closeUDS(closeUDSRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<CloseUDSResponseDTO>> call, Response<ServiceRESTResponse<CloseUDSResponseDTO>> response) {
                         analyzeAnswer(response, "lavorazione/closeUDS", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<CloseUDSResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<CloseUDSResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -160,15 +162,15 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
         colliLavorazioneRESTConsumerService.insertUDSRow(insertUDSRowRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<InsertUDSRowResponseDTO>> call, Response<ServiceRESTResponse<InsertUDSRowResponseDTO>> response) {
                         analyzeAnswer(response, "lavorazione/insertUDSRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<InsertUDSRowResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<InsertUDSRowResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -177,15 +179,15 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
         colliLavorazioneRESTConsumerService.editUDSRow(editUDSRowRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<EditUDSRowResponseDTO>> call, Response<ServiceRESTResponse<EditUDSRowResponseDTO>> response) {
                         analyzeAnswer(response, "lavorazione/editUDSRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<EditUDSRowResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<EditUDSRowResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -195,15 +197,15 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
         colliLavorazioneRESTConsumerService.deleteUDSRow(deleteUDSRowRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "lavorazione/deleteUDSRow", data -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -213,15 +215,15 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
         colliLavorazioneRESTConsumerService.deleteUDCRow(deleteUDCRowRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "lavorazione/deleteUDCRow", data -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -252,15 +254,15 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
         colliLavorazioneRESTConsumerService.createUDSFromArt(createUDSFromArtRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "lavorazione/createUDSFromArt", data -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
index 42080438..1c868fa7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
 import androidx.databinding.ObservableArrayList;
 
 import com.annimon.stream.Optional;
@@ -29,6 +30,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
@@ -46,7 +48,6 @@ import it.integry.integrywmsnative.core.utility.UtilityQuery;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -82,7 +83,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                             .setMtbPartitaMag(null));
         }
 
-        this.mEntityRESTConsumer.processEntity(mtbColtToSaveClone, new ISimpleOperationCallback<MtbColt>() {
+        this.mEntityRESTConsumer.processEntity(mtbColtToSaveClone, new ISimpleOperationCallback<>() {
             @Override
             public void onSuccess(MtbColt value) {
                 if (onComplete != null) onComplete.run(value);
@@ -285,7 +286,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
     public void getBySSCC(String ssccString, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.getColloByBarcode(ssccString, onlyResiduo, throwExcIfNull).enqueue(new Callback<>() {
+        colliMagazzinoRESTConsumerService.getColloByBarcode(ssccString, onlyResiduo, throwExcIfNull).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
                 analyzeAnswer(response, "GetBySSCC", mtbColt -> {
@@ -302,8 +303,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -385,27 +386,28 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
 
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.getColloInGiac(onlyResiduo, throwExcIfNull, testata).enqueue(new Callback<ServiceRESTResponse<MtbColt>>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
-                analyzeAnswer(response, "getColloInGiac", mtbColt -> {
+        colliMagazzinoRESTConsumerService.getColloInGiac(onlyResiduo, throwExcIfNull, testata)
+                .enqueue(new ManagedErrorCallback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
+                        analyzeAnswer(response, "getColloInGiac", mtbColt -> {
 
-                    if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
-                        List<MtbColt> mtbColtList = new ArrayList<>();
-                        mtbColtList.add(mtbColt);
-                        fillMtbAartsOfMtbColts(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
-                    } else {
-                        onComplete.run(mtbColt);
+                            if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+                                List<MtbColt> mtbColtList = new ArrayList<>();
+                                mtbColtList.add(mtbColt);
+                                fillMtbAartsOfMtbColts(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
+                            } else {
+                                onComplete.run(mtbColt);
+                            }
+
+                        }, onFailed);
                     }
 
-                }, onFailed);
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, Throwable t) {
-                onFailed.run(new Exception(t));
-            }
-        });
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
+                    }
+                });
     }
 
     public void spostaUL(MtbColt mtbColtToMove, String codMdep, String posizione, boolean createDocAutomatically, Runnable onComplete, RunnableArgs<Exception> onFailed) {
@@ -426,7 +428,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
         colliMagazzinoRESTConsumerService
                 .spostaUL(spostaUlRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "spostaUL", mtbColts -> {
@@ -435,8 +437,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        if (onFailed != null) onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        if (onFailed != null) onFailed.run(e);
                     }
                 });
     }
@@ -461,7 +463,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
         colliMagazzinoRESTConsumerService
                 .updateTipoUL(updateTipoULRequest)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "updateTipoUL", mtbColts -> {
@@ -470,8 +472,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        if (onFailed != null) onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        if (onFailed != null) onFailed.run(e);
                     }
                 });
 
@@ -495,7 +497,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
     public static void retrieveBasketColli(RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.getColliInBasket(SettingsManager.i().getUserSession().getDepo().getCodMdep()).enqueue(new Callback<ServiceRESTResponse<List<MtbColt>>>() {
+        colliMagazzinoRESTConsumerService.getColliInBasket(SettingsManager.i().getUserSession().getDepo().getCodMdep()).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<MtbColt>>> call, Response<ServiceRESTResponse<List<MtbColt>>> response) {
                 analyzeAnswer(response, "getColliInBasket", mtbColts -> {
@@ -504,8 +506,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<MtbColt>>> call, Throwable t) {
-                if (onFailed != null) onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<MtbColt>>> call, @NonNull final Exception e) {
+                if (onFailed != null) onFailed.run(e);
             }
         });
     }
@@ -524,15 +526,15 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         colliMagazzinoRESTConsumerService.creaRettificaCollo(
                 SettingsManager.i().getUserSession().getDepo().getCodMdep(),
                 rettificaULDTO
-        ).enqueue(new Callback<>() {
+        ).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<MtbColr>> call, Response<ServiceRESTResponse<MtbColr>> response) {
                 analyzeAnswer(response, "creaRettificaCollo", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<MtbColr>> call, Throwable t) {
-                if (onFailed != null) onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<MtbColr>> call, @NonNull final Exception e) {
+                if (onFailed != null) onFailed.run(e);
             }
         });
     }
@@ -556,7 +558,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                     .setFlagForceUseRefs(flagForceUseRefs);
 
             ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-            colliMagazzinoRESTConsumerService.spostaArtsTraUL(spostaArtsTraULRequestDTO).enqueue(new Callback<>() {
+            colliMagazzinoRESTConsumerService.spostaArtsTraUL(spostaArtsTraULRequestDTO).enqueue(new ManagedErrorCallback<>() {
                 @Override
                 public void onResponse(Call<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> call, Response<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> response) {
                     analyzeAnswer(response, "spostaArtsTraUL", data -> {
@@ -565,8 +567,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                 }
 
                 @Override
-                public void onFailure(Call<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> call, Throwable t) {
-                    if (onFailed != null) onFailed.run(new Exception(t));
+                public void onFailure(Call<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> call, @NonNull final Exception e) {
+                    if (onFailed != null) onFailed.run(e);
                 }
             });
         }).start();
@@ -582,7 +584,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }
 
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.assegnaLottoSuColloScarico(sourceMtbColtClone).enqueue(new Callback<>() {
+        colliMagazzinoRESTConsumerService.assegnaLottoSuColloScarico(sourceMtbColtClone).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
                 analyzeAnswer(response, "assegnaLottoSuColloScarico", data -> {
@@ -591,8 +593,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, Throwable t) {
-                if (onFailed != null) onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, @NonNull final Exception e) {
+                if (onFailed != null) onFailed.run(e);
             }
         });
     }
@@ -607,7 +609,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }
 
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.versamentoAutomaticoUL(sourceMtbColtClone).enqueue(new Callback<>() {
+        colliMagazzinoRESTConsumerService.versamentoAutomaticoUL(sourceMtbColtClone).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> call, Response<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> response) {
                 analyzeAnswer(response, "versamentoAutomaticoUL", data -> {
@@ -644,8 +646,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> call, Throwable t) {
-                if (onFailed != null) onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> call, @NonNull final Exception e) {
+                if (onFailed != null) onFailed.run(e);
             }
         });
     }
@@ -655,7 +657,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         sourceMtbColtClone.setMtbColr(new ObservableArrayList<>());
 
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.confirmGiacenzaUL(sourceMtbColtClone).enqueue(new Callback<>() {
+        colliMagazzinoRESTConsumerService.confirmGiacenzaUL(sourceMtbColtClone).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                 analyzeAnswer(response, "confirmGiacenzaUL", data -> {
@@ -665,8 +667,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
-                if (onFailed != null) onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<Object>> call, @NonNull final Exception e) {
+                if (onFailed != null) onFailed.run(e);
             }
         });
     }
@@ -705,15 +707,15 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
 
         colliMagazzinoRESTConsumerService.canULBeDeleted(canULBeDeletedRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
                         analyzeAnswer(response, "generic/canULBeDeleted", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
@@ -723,15 +725,15 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
 
         colliMagazzinoRESTConsumerService.deleteUL(deleteULRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "generic/deleteUL", Void -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
@@ -746,15 +748,15 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
 
         colliMagazzinoRESTConsumerService.printUL(printULRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "generic/printUL", Void -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java
index a44d8bc2..da54620c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliSpedizioneRESTConsumer.java
@@ -9,6 +9,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliScaricoRESTConsumerInterface;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
@@ -22,7 +23,6 @@ import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowResponseDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -33,15 +33,15 @@ public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements Co
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
         colliSpedizioneRESTConsumerService.createUDS(createUDSRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<CreateUDSResponseDTO>> call, Response<ServiceRESTResponse<CreateUDSResponseDTO>> response) {
                         analyzeAnswer(response, "spedizione/createUDS", data -> onComplete.run(data.getMtbColt()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<CreateUDSResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<CreateUDSResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
@@ -51,15 +51,15 @@ public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements Co
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
         colliSpedizioneRESTConsumerService.closeUDS(closeUDSRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<CloseUDSResponseDTO>> call, Response<ServiceRESTResponse<CloseUDSResponseDTO>> response) {
                         analyzeAnswer(response, "spedizione/closeUDS", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<CloseUDSResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<CloseUDSResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
@@ -69,15 +69,15 @@ public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements Co
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
         colliSpedizioneRESTConsumerService.insertUDSRow(insertUDSRowRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<InsertUDSRowResponseDTO>> call, Response<ServiceRESTResponse<InsertUDSRowResponseDTO>> response) {
                         analyzeAnswer(response, "spedizione/insertUDSRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<InsertUDSRowResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<InsertUDSRowResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -86,15 +86,15 @@ public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements Co
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
         colliSpedizioneRESTConsumerService.editUDSRow(editUDSRowRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<EditUDSRowResponseDTO>> call, Response<ServiceRESTResponse<EditUDSRowResponseDTO>> response) {
                         analyzeAnswer(response, "spedizione/editUDSRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<EditUDSRowResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<EditUDSRowResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -103,15 +103,15 @@ public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements Co
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
         colliSpedizioneRESTConsumerService.deleteUDSRow(deleteUDSRowRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "spedizione/deleteUDSRow", data -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
@@ -121,14 +121,14 @@ public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements Co
         ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
 
         colliSpedizioneRESTConsumerService.duplicateUDS(duplicateUDSRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull Response<ServiceRESTResponse<DuplicateUDSResponseDTO>> response) {
                         analyzeAnswer(response, "spedizione/duplicateUDS", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull Throwable t) {
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull final Exception e) {
                         onFailed.run(new Exception());
                     }
                 });
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java
index 10ebd3ea..ee911b9e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java
@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import androidx.annotation.NonNull;
 
-import java.util.Date;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -10,11 +9,11 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.DtbDoct;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.LoadColliDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.documento.RetrieveDocumentoArtsResponseDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -23,30 +22,30 @@ public class DocumentRESTConsumer extends _BaseRESTConsumer {
 
     public void createDocsFromColli(List<LoadColliDTO> listColli, RunnableArgs<List<DtbDoct>> onComplete, RunnableArgs<Exception> onFailed) {
         DocumentiRESTConsumerService documentiRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
-        documentiRESTConsumerService.createDocsFromColli(listColli).enqueue(new Callback<>() {
+        documentiRESTConsumerService.createDocsFromColli(listColli).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<DtbDoct>>> call, Response<ServiceRESTResponse<List<DtbDoct>>> response) {
                 analyzeAnswer(response, "createDocsFromColli", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<DtbDoct>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<DtbDoct>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
 
     public void createDocFromColli(LoadColliDTO loadColliDTO, RunnableArgs<DtbDoct> onComplete, RunnableArgs<Exception> onFailed) {
         DocumentiRESTConsumerService documentiRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
-        documentiRESTConsumerService.createDocFromColli(loadColliDTO).enqueue(new Callback<>() {
+        documentiRESTConsumerService.createDocFromColli(loadColliDTO).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<DtbDoct>> call, Response<ServiceRESTResponse<DtbDoct>> response) {
                 analyzeAnswer(response, "createDocFromColli", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<DtbDoct>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<DtbDoct>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -54,15 +53,15 @@ public class DocumentRESTConsumer extends _BaseRESTConsumer {
     public void checkDocument(String fornitore, String numDoc, String dataDoc, String tipoDoc, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
         var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
         inventarioRESTConsumerService.checkDocument(fornitore, numDoc,tipoDoc, dataDoc)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(@NonNull Call<ServiceRESTResponse<Boolean>> call, @NonNull Response<ServiceRESTResponse<Boolean>> response) {
                         analyzeAnswer(response, "checkDocument", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(@NonNull Call<ServiceRESTResponse<Boolean>> call, @NonNull Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<Boolean>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -70,15 +69,15 @@ public class DocumentRESTConsumer extends _BaseRESTConsumer {
     public void loadDocumentAvailableArts(String codDtip, String codMgrp, String codAnagForn, RunnableArgs<RetrieveDocumentoArtsResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
         var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
         inventarioRESTConsumerService.retrieveArts(codDtip, codMgrp, codAnagForn)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(@NonNull Call<ServiceRESTResponse<RetrieveDocumentoArtsResponseDTO>> call, @NonNull Response<ServiceRESTResponse<RetrieveDocumentoArtsResponseDTO>> response) {
                         analyzeAnswer(response, "loadDocumentoArts", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(@NonNull Call<ServiceRESTResponse<RetrieveDocumentoArtsResponseDTO>> call, @NonNull Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<RetrieveDocumentoArtsResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java
index 7ecfc092..a17f3de3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java
@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 
@@ -13,11 +15,11 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.EntityBase;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.EsitoType;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityGson;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -33,7 +35,7 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
         EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class);
         service
                 .processEntity(entityToSave)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<JsonObject>> call, Response<ServiceRESTResponse<JsonObject>> response) {
                         if (response.isSuccessful()) {
@@ -59,9 +61,8 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, Throwable t) {
-                        Log.e("EntityRESTConsumer", t.toString());
-                        tmpFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, @NonNull final Exception e) {
+                        tmpFailed.run(e);
                     }
                 });
 
@@ -76,7 +77,7 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
 
         EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class);
         Call<List<ServiceRESTResponse<JsonObject>>> request = service.processEntityList(singleTransaction, entitiesToSave);
-        request.enqueue(new Callback<>() {
+        request.enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<List<ServiceRESTResponse<JsonObject>>> call, Response<List<ServiceRESTResponse<JsonObject>>> response) {
                 if (response.isSuccessful()) {
@@ -112,9 +113,8 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<List<ServiceRESTResponse<JsonObject>>> call, Throwable t) {
-                Log.e("EntityRESTConsumer", t.toString());
-                tmpFailed.run(new Exception(t));
+            public void onFailure(Call<List<ServiceRESTResponse<JsonObject>>> call, @NonNull final Exception e) {
+                tmpFailed.run(e);
             }
         });
 
@@ -126,7 +126,7 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
 
         EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class);
         Call<ServiceRESTResponse<JsonObject>> request = service.processEntity(entityToSave);
-        request.enqueue(new Callback<>() {
+        request.enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<JsonObject>> call, Response<ServiceRESTResponse<JsonObject>> response) {
                 if (response.isSuccessful()) {
@@ -136,7 +136,7 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
                             Gson gson = UtilityGson.createObject();
                             List<JsonObject> jsons = response.body().getEntityList();
 
-                            List<T> newList = new ArrayList<T>();
+                            List<T> newList = new ArrayList<>();
 
                             if (jsons != null) {
                                 for (int i = 0; i < jsons.size(); i++) {
@@ -163,9 +163,8 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, Throwable t) {
-                Log.e("EntityRESTConsumer", t.toString());
-                callback.onFailed(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, @NonNull final Exception e) {
+                callback.onFailed(e);
             }
         });
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java
index fcd030f3..3fc1848e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java
@@ -1,6 +1,6 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import android.util.Log;
+import androidx.annotation.NonNull;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -10,12 +10,11 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.StbGestSetup;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.GestSetupDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.settings.StbGestSetupReader;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -25,17 +24,15 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
         GestSetupRESTConsumerService service = RESTBuilder.getService(GestSetupRESTConsumerService.class);
 
         service.getGestSetupValue(gestName, sectionName, keySection)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<GestSetupDTO>> call, Response<ServiceRESTResponse<GestSetupDTO>> response) {
                         analyzeAnswer(response, "GestSetup", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<GestSetupDTO>> call, Throwable t) {
-                        Log.e("GestSetup", t.toString());
-                        // UtilityLogger.errorMe(new Exception(t));
-                        if (onFailed != null) onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<GestSetupDTO>> call, @NonNull final Exception e) {
+                        if (onFailed != null) onFailed.run(e);
                     }
                 });
     }
@@ -52,17 +49,15 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
 
     public void getValue(String gestName, String sectionName, String keySection, String codMdep, RunnableArgs<GestSetupDTO> onComplete, RunnableArgs<Exception> onFailed) {
         GestSetupRESTConsumerService service = RESTBuilder.getService(GestSetupRESTConsumerService.class);
-        service.getGestSetupValue(gestName, sectionName, keySection, codMdep).enqueue(new Callback<ServiceRESTResponse<GestSetupDTO>>() {
+        service.getGestSetupValue(gestName, sectionName, keySection, codMdep).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<GestSetupDTO>> call, Response<ServiceRESTResponse<GestSetupDTO>> response) {
                 analyzeAnswer(response, "GestSetup", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<GestSetupDTO>> call, Throwable t) {
-                Log.e("PrintCollo", t.toString());
-                UtilityLogger.error(new Exception(t));
-                if (onFailed != null) onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<GestSetupDTO>> call, @NonNull final Exception e) {
+                if (onFailed != null) onFailed.run(e);
             }
         });
     }
@@ -82,7 +77,7 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
         var stbGestSetups = stbGestSetupList.stream().map(x -> (StbGestSetup) x).collect(Collectors.toList());
 
         GestSetupRESTConsumerService service = RESTBuilder.getService(GestSetupRESTConsumerService.class);
-        service.getGestSetupValues(codMdep, stbGestSetups).enqueue(new Callback<>() {
+        service.getGestSetupValues(codMdep, stbGestSetups).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<StbGestSetup>>> call, Response<ServiceRESTResponse<List<StbGestSetup>>> response) {
                 analyzeAnswer(response, "GestSetup", data -> {
@@ -100,9 +95,8 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<StbGestSetup>>> call, Throwable t) {
-                UtilityLogger.error(new Exception(t));
-                if (onFailed != null) onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<StbGestSetup>>> call, @NonNull final Exception e) {
+                if (onFailed != null) onFailed.run(e);
             }
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java
index 0541f82c..3be25f19 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 
@@ -13,13 +15,13 @@ import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.giacenza.InstantItemSituationIncomingItemDto;
 import it.integry.integrywmsnative.core.rest.model.giacenza.InstantItemSituationResponseDto;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto.ArtsInGiacenzaDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -34,7 +36,7 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
 
     public void getGiacenzeInPosizione(MtbDepoPosizione posizione, RunnableArgs<List<MvwSitArtUdcDetInventario>> onComplete, RunnableArgs<Exception> onFailed) {
         GiacenzaRESTConsumerService giacenzaRESTConsumerService = RESTBuilder.getService(GiacenzaRESTConsumerService.class);
-        giacenzaRESTConsumerService.retrieveAvailableItems(posizione.getPosizione()).enqueue(new Callback<>() {
+        giacenzaRESTConsumerService.retrieveAvailableItems(posizione.getPosizione()).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, Response<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> response) {
                 analyzeAnswer(response, "getGiacenzeInPosizione", inventarioList -> {
@@ -68,15 +70,15 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
 
     public void getGiacenzeInPosizione(List<String> posizioni, boolean withTestataCollo, RunnableArgs<List<ArtsInGiacenzaDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         GiacenzaRESTConsumerService giacenzaRESTConsumerService = RESTBuilder.getService(GiacenzaRESTConsumerService.class);
-        giacenzaRESTConsumerService.retrieveAvailableItems(posizioni, withTestataCollo).enqueue(new Callback<>() {
+        giacenzaRESTConsumerService.retrieveAvailableItems(posizioni, withTestataCollo).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<ArtsInGiacenzaDTO>>> call, Response<ServiceRESTResponse<List<ArtsInGiacenzaDTO>>> response) {
                 analyzeAnswer(response, "getGiacenzeInPosizione", inventarioList -> {
@@ -110,8 +112,8 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<ArtsInGiacenzaDTO>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<ArtsInGiacenzaDTO>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -122,7 +124,7 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
                 UtilityString.isNullOrEmpty(partitaMag) ?
                         giacenzaRESTConsumerService.retrieveAvailableItemsByArt(codMart) :
                         giacenzaRESTConsumerService.retrieveAvailableItemsByArt(codMart, partitaMag);
-        serviceRESTResponseCall.enqueue(new Callback<>() {
+        serviceRESTResponseCall.enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, Response<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> response) {
                 analyzeAnswer(response, "getGiacenzeByArticolo", inventarioList -> {
@@ -153,8 +155,8 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -164,7 +166,7 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
         GiacenzaRESTConsumerService giacenzaRESTConsumerService = RESTBuilder.getService(GiacenzaRESTConsumerService.class);
 
         giacenzaRESTConsumerService.retrieveInstantItemSituation(codMdep, codMart, partitaMag, codJcom)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<InstantItemSituationResponseDto>> call, Response<ServiceRESTResponse<InstantItemSituationResponseDto>> response) {
                         analyzeAnswer(response, "getInstantItemSituation", data -> {
@@ -174,8 +176,8 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<InstantItemSituationResponseDto>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<InstantItemSituationResponseDto>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/InventarioRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/InventarioRESTConsumer.java
index 10fb6f71..0aa40012 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/InventarioRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/InventarioRESTConsumer.java
@@ -9,12 +9,12 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbInvent;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.inventario.InsertInventarioRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.inventario.RetrieveInventarioArtsResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.inventario.RetrieveInventarioResponseDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -24,15 +24,15 @@ public class InventarioRESTConsumer extends _BaseRESTConsumer {
     public void loadInventario(long inventoryId, RunnableArgs<RetrieveInventarioResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
         var inventarioRESTConsumerService = RESTBuilder.getService(InventarioRESTConsumerService.class);
         inventarioRESTConsumerService.retrieve(inventoryId)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(@NonNull Call<ServiceRESTResponse<RetrieveInventarioResponseDTO>> call, @NonNull Response<ServiceRESTResponse<RetrieveInventarioResponseDTO>> response) {
                         analyzeAnswer(response, "loadInventario", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(@NonNull Call<ServiceRESTResponse<RetrieveInventarioResponseDTO>> call, @NonNull Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<RetrieveInventarioResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -41,15 +41,15 @@ public class InventarioRESTConsumer extends _BaseRESTConsumer {
     public void loadInventarioArts(long inventoryId, RunnableArgs<RetrieveInventarioArtsResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
         var inventarioRESTConsumerService = RESTBuilder.getService(InventarioRESTConsumerService.class);
         inventarioRESTConsumerService.retrieveArts(inventoryId)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(@NonNull Call<ServiceRESTResponse<RetrieveInventarioArtsResponseDTO>> call, @NonNull Response<ServiceRESTResponse<RetrieveInventarioArtsResponseDTO>> response) {
                         analyzeAnswer(response, "loadInventarioArts", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(@NonNull Call<ServiceRESTResponse<RetrieveInventarioArtsResponseDTO>> call, @NonNull Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<RetrieveInventarioArtsResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -73,15 +73,15 @@ public class InventarioRESTConsumer extends _BaseRESTConsumer {
         var inventarioRESTConsumerService = RESTBuilder.getService(InventarioRESTConsumerService.class, 300);
         inventarioRESTConsumerService
                 .insert(inventarioToInsert.getIdInventario(), request)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "insertInventario", ignored -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoAutomaticoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoAutomaticoRESTConsumer.java
index 27807571..5d0cc52f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoAutomaticoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoAutomaticoRESTConsumer.java
@@ -1,15 +1,17 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPickItemsRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPutItemsRequestDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -18,15 +20,15 @@ public class MagazzinoAutomaticoRESTConsumer extends _BaseRESTConsumer {
     public void pickItems(MtbDepoPosizione posizione, MagazzinoAutomaticoPickItemsRequestDTO magazzinoAutomaticoPickItemsRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         MagazzinoAutomaticoRESTConsumerService magazzinoAutomaticoRESTConsumerService = RESTBuilder.getService(MagazzinoAutomaticoRESTConsumerService.class);
         magazzinoAutomaticoRESTConsumerService.pickItems(posizione.getPosizione(), magazzinoAutomaticoPickItemsRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "magazzino-automatico/pickItems", data -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
@@ -36,15 +38,15 @@ public class MagazzinoAutomaticoRESTConsumer extends _BaseRESTConsumer {
     public void putItems(MtbDepoPosizione posizione, MagazzinoAutomaticoPutItemsRequestDTO magazzinoAutomaticoPutItemsRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         MagazzinoAutomaticoRESTConsumerService magazzinoAutomaticoRESTConsumerService = RESTBuilder.getService(MagazzinoAutomaticoRESTConsumerService.class);
         magazzinoAutomaticoRESTConsumerService.putItems(posizione.getPosizione(), magazzinoAutomaticoPutItemsRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "magazzino-automatico/putItems", data -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoBufferRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoBufferRESTConsumer.java
index 5ba6535c..98f4f3e9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoBufferRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoBufferRESTConsumer.java
@@ -1,15 +1,17 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.magazzino_buffer.MagazzinoBufferVersamentoMaterialeCloseRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.magazzino_buffer.MagazzinoBufferVersamentoMaterialeRequestDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -18,15 +20,15 @@ public class MagazzinoBufferRESTConsumer extends _BaseRESTConsumer {
     public void isVersamentoStarted(MtbDepoPosizione posizione, MagazzinoBufferVersamentoMaterialeRequestDTO magazzinoBufferVersamentoMaterialeRequestDTO, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
         MagazzinoBufferRESTConsumerService magazzinoBufferRESTConsumerService = RESTBuilder.getService(MagazzinoBufferRESTConsumerService.class);
         magazzinoBufferRESTConsumerService.isVersamentoStarted(posizione.getPosizione(), magazzinoBufferVersamentoMaterialeRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
                         analyzeAnswer(response, "magazzino-buffer/isVersamentoStarted", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -34,15 +36,15 @@ public class MagazzinoBufferRESTConsumer extends _BaseRESTConsumer {
     public void startVersamentoMateriale(MtbDepoPosizione posizione, MagazzinoBufferVersamentoMaterialeRequestDTO magazzinoBufferVersamentoMaterialeRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         MagazzinoBufferRESTConsumerService magazzinoBufferRESTConsumerService = RESTBuilder.getService(MagazzinoBufferRESTConsumerService.class);
         magazzinoBufferRESTConsumerService.startVersamentoMateriale(posizione.getPosizione(), magazzinoBufferVersamentoMaterialeRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "magazzino-buffer/startVersamentoMateriale", data -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -50,15 +52,15 @@ public class MagazzinoBufferRESTConsumer extends _BaseRESTConsumer {
     public void endVersamentoMateriale(MtbDepoPosizione posizione, MagazzinoBufferVersamentoMaterialeCloseRequestDTO magazzinoBufferVersamentoMaterialeCloseRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         MagazzinoBufferRESTConsumerService magazzinoBufferRESTConsumerService = RESTBuilder.getService(MagazzinoBufferRESTConsumerService.class);
         magazzinoBufferRESTConsumerService.endVersamentoMateriale(posizione.getPosizione(), magazzinoBufferVersamentoMaterialeCloseRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "magazzino-buffer/endVersamentoMateriale", data -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java
index 602ce4b0..fb0b7ef6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java
@@ -9,14 +9,13 @@ import java.util.concurrent.ExecutorService;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -33,15 +32,15 @@ public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
     public void saveTerminalinoWMS(SaveDTO saveDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class);
         service.saveTerminalinoWMS(saveDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "saveTerminalinoWMS", data -> onComplete.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -69,15 +68,15 @@ public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
     public void retrieveAllPartitaMag(List<String> codMarts, Date dataScad, RunnableArgs<List<MtbPartitaMag>> onComplete, RunnableArgs<Exception> onFailed) {
         MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class);
         service.retrieveAllPartitaMag(codMarts, UtilityDate.formatDate(dataScad, UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH))
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(@NonNull Call<ServiceRESTResponse<List<MtbPartitaMag>>> call, @NonNull Response<ServiceRESTResponse<List<MtbPartitaMag>>> response) {
                         analyzeAnswer(response, "retrieveAllPartitaMag", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(@NonNull Call<ServiceRESTResponse<List<MtbPartitaMag>>> call, @NonNull Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<List<MtbPartitaMag>>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java
index 53c70d65..eb394b2a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java
@@ -1,10 +1,11 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -12,12 +13,11 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.JtbFasi;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -33,15 +33,15 @@ public class MesRESTConsumer extends _BaseRESTConsumer {
         MesRESTConsumerService mesRESTConsumerService = RESTBuilder.getService(MesRESTConsumerService.class);
 
         mesRESTConsumerService.getOrdiniLavorazioneMateriale(codJfas, idMateriale)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Response<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> response) {
                         analyzeAnswer(response, "getOrdiniLavorazioneMateriale", (m) -> onComplete.run(response.body().getDto()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -50,15 +50,15 @@ public class MesRESTConsumer extends _BaseRESTConsumer {
         MesRESTConsumerService mesRESTConsumerService = RESTBuilder.getService(MesRESTConsumerService.class);
 
         mesRESTConsumerService.getOrdiniLavorazione(null, flagEvaso, codJfas, codAnag)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Response<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> response) {
                         analyzeAnswer(response, "getOrdiniLavorazione", (m) -> onComplete.run(response.body().getDto()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -68,15 +68,15 @@ public class MesRESTConsumer extends _BaseRESTConsumer {
         MesRESTConsumerService mesRESTConsumerService = RESTBuilder.getService(MesRESTConsumerService.class);
 
         mesRESTConsumerService.getOrdiniLavorazione(flagEvaso)
-                .enqueue(new Callback<ServiceRESTResponse<List<OrdineLavorazioneDTO>>>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Response<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> response) {
                         analyzeAnswer(response, "getOrdiniLavorazione", (m) -> onComplete.run(response.body().getDto()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java
index 03262225..c3b17aa5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 import com.google.gson.reflect.TypeToken;
@@ -21,17 +23,16 @@ import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityQuery;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -49,7 +50,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
         OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);
         service
                 .getSuggestedPickingList(codMdep, sitArtOrdList)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<PickingObjectDTO>>> call, Response<ServiceRESTResponse<List<PickingObjectDTO>>> response) {
                         analyzeAnswer(response, "getSuggestedPickingList", pickingObjects -> {
@@ -109,8 +110,8 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<PickingObjectDTO>>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<List<PickingObjectDTO>>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
@@ -126,7 +127,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
         OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class);
 
         service.getOrdiniInevasi(codMdep, gestione.getText())
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, Response<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> response) {
                         analyzeAnswer(response, "getOrdiniInevasi", responseDtoList -> {
@@ -139,9 +140,8 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, Throwable t) {
-                        Logger.e(t, "Errore durante il caricamento degli ordini di lavorazione");
-                        if (onFailed != null) onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, @NonNull final Exception e) {
+                        if (onFailed != null) onFailed.run(e);
                     }
                 });
     }
@@ -158,7 +158,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
         OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);
 
-        service.getArticoliFromOrdini(codMdep, getPickingListDTOs).enqueue(new Callback<>() {
+        service.getArticoliFromOrdini(codMdep, getPickingListDTOs).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
                 analyzeAnswer(response, "retrieveListaArticoliFromOrdiniUscita", sitArtOrds -> {
@@ -173,9 +173,8 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Throwable t) {
-                UtilityLogger.error(new Exception(t));
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java
index 930353f6..a095df0e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java
@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
@@ -14,14 +16,13 @@ import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
 import it.integry.integrywmsnative.core.data_store.db.view_model.OrdiniAcquistoGrigliaDTO;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ArtDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.OrdineDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -36,7 +37,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
     public void retrieveArticoli(String codAlis, String codMdep, RunnableArgs<OrdiniAcquistoGrigliaDTO> onSuccess, RunnableArgs<Exception> onFailed) {
         PVOrdiniAcquistoRESTConsumerService ordiniARestService = RESTBuilder.getService(PVOrdiniAcquistoRESTConsumerService.class, 300);
         ordiniARestService.retrieveArticoli(codAlis, codMdep, null)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Response<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> response) {
                         var startTime = new Date().getTime();
@@ -47,8 +48,8 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -56,7 +57,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
     public void retrieveArticolo(String codAlis, String codMdep, String barcode, RunnableArgs<OrdiniAcquistoGrigliaDTO> onSuccess, RunnableArgs<Exception> onFailed) {
         PVOrdiniAcquistoRESTConsumerService ordiniARestService = RESTBuilder.getService(PVOrdiniAcquistoRESTConsumerService.class, 300);
         ordiniARestService.retrieveArticoli(codAlis, codMdep, barcode)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Response<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> response) {
                         var startTime = new Date().getTime();
@@ -67,8 +68,8 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -91,7 +92,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
 
         PVOrdiniAcquistoRESTConsumerService ordiniARestService = RESTBuilder.getService(PVOrdiniAcquistoRESTConsumerService.class, 300);
         ordiniARestService.save(codMdep, saveDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                         var startTime = new Date().getTime();
@@ -113,10 +114,8 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
-                        Log.e("saveOrdine", t.toString());
-                        UtilityLogger.error(new Exception(t));
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Object>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java
index 25cf1d01..ceb4d905 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
@@ -12,10 +14,10 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -31,7 +33,7 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer {
         String codMdep = null;
 
         PosizioniRESTConsumerService posizioniRESTConsumerService = RESTBuilder.getService(PosizioniRESTConsumerService.class);
-        posizioniRESTConsumerService.getAvailablePosizioni(codMdep).enqueue(new Callback<>() {
+        posizioniRESTConsumerService.getAvailablePosizioni(codMdep).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<MtbDepoPosizione>>> call, Response<ServiceRESTResponse<List<MtbDepoPosizione>>> response) {
                 analyzeAnswer(response, "getAvailablePosizioni", (m) -> {
@@ -40,8 +42,8 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<MtbDepoPosizione>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<MtbDepoPosizione>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java
index b7822bf8..9cacc18c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java
@@ -1,6 +1,6 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import android.util.Log;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
@@ -10,20 +10,18 @@ import java.util.List;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.BuildConfig;
-import it.integry.integrywmsnative.core.exception.NoPrintersFoundException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.report.ReportType;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.JasperDTO;
 import it.integry.integrywmsnative.core.rest.model.JasperPairDTO;
 import it.integry.integrywmsnative.core.rest.model.ReportTypeDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -40,7 +38,7 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
         String printerTypeStr = printerType != null ? printerType.toString() : null;
 
         PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
-        printerService.getAvailablePrinters(codMdep, printerTypeStr).enqueue(new Callback<>() {
+        printerService.getAvailablePrinters(codMdep, printerTypeStr).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<String>>> call, Response<ServiceRESTResponse<List<String>>> response) {
                 analyzeAnswer(response, "GetAvailablePrinters", printerList -> {
@@ -50,10 +48,8 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<String>>> call, Throwable t) {
-                Log.e("GetAvailablePrinters", t.toString());
-                UtilityLogger.error(new Exception(t));
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<String>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -68,7 +64,7 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
         PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
         printerService
                 .printCollo(testataColloToPrint)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                         analyzeAnswer(response, "printCollo", data -> {
@@ -77,10 +73,8 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
-                        if (t.getMessage().contains("Printer not found")) {
-                            onFailed.run(new NoPrintersFoundException());
-                        } else onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Object>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -101,7 +95,7 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
         PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
         printerService
                 .processPrintReport(printerName, quantity, jasperDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                         analyzeAnswer(response, "printReport", data -> {
@@ -110,10 +104,8 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
-                        if (t.getMessage().contains("Printer not found")) {
-                            onFailed.run(new NoPrintersFoundException());
-                        } else onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Object>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -131,7 +123,7 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
         PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
         printerService
                 .printReportType(reportTypeDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                         analyzeAnswer(response, "printReportType", data -> {
@@ -140,10 +132,8 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
-                        if (t.getMessage().contains("Printer not found")) {
-                            onFailed.run(new NoPrintersFoundException());
-                        } else onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Object>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -164,7 +154,7 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
 
         PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class, 240);
         Call<ServiceRESTResponse<Object>> callable = printerService.printClosedOrders(codMdep, dto);
-        callable.enqueue(new Callback<>() {
+        callable.enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                 analyzeAnswer(response, "printCollo", data -> {
@@ -173,10 +163,8 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
-                if (t.getMessage().contains("Printer not found")) {
-                    onFailed.run(new NoPrintersFoundException());
-                } else onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<Object>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProductionLinesRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProductionLinesRESTConsumer.java
index 0b802557..34905843 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProductionLinesRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProductionLinesRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import com.annimon.stream.Stream;
 import com.google.gson.JsonObject;
 
@@ -9,10 +11,10 @@ import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -21,7 +23,7 @@ public class ProductionLinesRESTConsumer extends _BaseRESTConsumer {
     public void avviaLineaDiProduzione(String codJfas, Integer hrNum, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class);
         Call<ServiceRESTResponse<JsonObject>> callable = restService.avviaLineaDiProduzione(codJfas, hrNum);
-        callable.enqueue(new Callback<>() {
+        callable.enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<JsonObject>> call, Response<ServiceRESTResponse<JsonObject>> response) {
                 analyzeAnswer(response, "avviaLineaDiProduzione", data -> {
@@ -30,8 +32,8 @@ public class ProductionLinesRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -39,7 +41,7 @@ public class ProductionLinesRESTConsumer extends _BaseRESTConsumer {
     public void arrestaLineaDiProduzione(String codJfas, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class);
         Call<ServiceRESTResponse<JsonObject>> callable = restService.arrestaLineaDiProduzione(codJfas);
-        callable.enqueue(new Callback<>() {
+        callable.enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<JsonObject>> call, Response<ServiceRESTResponse<JsonObject>> response) {
                 analyzeAnswer(response, "arrestaLineaDiProduzione", data -> {
@@ -48,8 +50,8 @@ public class ProductionLinesRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -57,7 +59,7 @@ public class ProductionLinesRESTConsumer extends _BaseRESTConsumer {
     public void avviaProduzioneArticoloSuLinea(String codJfas, String codMart, String partitaMag, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class, 300);
         Call<ServiceRESTResponse<JsonObject>> callable = restService.avviaProduzioneArticoloSuLinea(codJfas, codMart, partitaMag);
-        callable.enqueue(new Callback<>() {
+        callable.enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<JsonObject>> call, Response<ServiceRESTResponse<JsonObject>> response) {
                 analyzeAnswer(response, "avviaProduzioneArticoloSuLinea", data -> {
@@ -66,8 +68,8 @@ public class ProductionLinesRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<JsonObject>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -75,15 +77,15 @@ public class ProductionLinesRESTConsumer extends _BaseRESTConsumer {
     public void getStatoLinee(String codMdep, RunnableArgs<List<ProdLineStatusDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class);
         Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> callable = restService.getStatoLinee(codMdep);
-        callable.enqueue(new Callback<>() {
+        callable.enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> call, Response<ServiceRESTResponse<List<ProdLineStatusDTO>>> response) {
                 analyzeAnswer(response, "getStatoLinee", onComplete::run, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -92,7 +94,7 @@ public class ProductionLinesRESTConsumer extends _BaseRESTConsumer {
     public void getLineDetails(ProdLineStatusDTO lineaProd, RunnableArgs<ProdLineStatusDTO> onComplete, RunnableArgs<Exception> onFailed) {
         ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class);
         Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> callable = restService.getStatoLinee(lineaProd.getCodMdepLav());
-        callable.enqueue(new Callback<>() {
+        callable.enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> call, Response<ServiceRESTResponse<List<ProdLineStatusDTO>>> response) {
                 analyzeAnswer(response, "getLineDetails", (lines) -> {
@@ -102,8 +104,8 @@ public class ProductionLinesRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<ProdLineStatusDTO>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumer.java
index 0efd676c..ae7f2e55 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumer.java
@@ -1,15 +1,15 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import com.orhanobut.logger.Logger;
+import androidx.annotation.NonNull;
 
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.produzione.CaricoProdFinDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -22,7 +22,7 @@ public class ProduzioneRESTConsumer extends _BaseRESTConsumer{
 
         ProduzioneRESTConsumerService service = RESTBuilder.getService(ProduzioneRESTConsumerService.class);
         service.caricoProdFin(caricoProdFin)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "caricoProdFin", Void -> onComplete.run(), ex -> {
@@ -31,9 +31,8 @@ public class ProduzioneRESTConsumer extends _BaseRESTConsumer{
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        Logger.e(t, "caricoProdFin");
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
index da5fd31c..f0f5db5f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
@@ -3,24 +3,24 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import com.google.gson.Gson;
-import com.orhanobut.logger.Logger;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.Type;
-import java.net.ConnectException;
 import java.util.List;
 
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.CommonConst;
-import it.integry.integrywmsnative.core.exception.InvalidConnectionException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO;
@@ -31,7 +31,6 @@ import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityGson;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -41,15 +40,15 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
     public void retrieveUpdatesInfo(final RunnableArgs<LatestAppVersionInfoDTO> onSuccess, final RunnableArgs<Exception> onFailed) {
         SystemRESTConsumerService systemRESTConsumerService = RESTBuilder.getService(SystemRESTConsumerService.class);
         systemRESTConsumerService.retrieveUpdatesInfo()
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<LatestAppVersionInfoDTO> call, Response<LatestAppVersionInfoDTO> response) {
                         analyzeAnswerGeneric(response, "updates", onSuccess, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<LatestAppVersionInfoDTO> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<LatestAppVersionInfoDTO> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -61,15 +60,15 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
 
         SystemRESTConsumerService systemRESTConsumerService = RESTBuilder.getService(SystemRESTConsumerService.class);
         systemRESTConsumerService.registerDevice(registerDeviceRequestDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswer(response, "device/register", Void -> onSuccess.run(), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
 
@@ -82,7 +81,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
         SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class);
         service
                 .processSql(nativeSqlDTO)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                         analyzeAnswer(response, "ProcessSql", o -> {
@@ -100,13 +99,8 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
-                        Logger.e(t, "ProcessSQL");
-
-                        if (t instanceof ConnectException)
-                            onFailed.run(new InvalidConnectionException(RESTBuilder.getDefaultHost(), RESTBuilder.getDefaultPort(), t));
-                        else
-                            onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Object>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -114,16 +108,15 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
 
     public void getAvailableCodMdeps(final RunnableArgs<List<AvailableCodMdepsDTO>> onSuccess, RunnableArgs<Exception> onFailed) {
         SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class);
-        service.getAvailableCodMdeps().enqueue(new Callback<>() {
+        service.getAvailableCodMdeps().enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<AvailableCodMdepsDTO>>> call, Response<ServiceRESTResponse<List<AvailableCodMdepsDTO>>> response) {
                 analyzeAnswer(response, "CodMdepsAvailable", onSuccess, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<AvailableCodMdepsDTO>>> call, final Throwable t) {
-                Log.e("CodMdepsAvailable", t.toString());
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<AvailableCodMdepsDTO>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -161,16 +154,16 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
     public void sendMail(MailRequestDTO mailDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
 
         SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class);
-        service.sendMail(mailDTO).enqueue(new Callback<>() {
+        service.sendMail(mailDTO).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<String>> call, Response<ServiceRESTResponse<String>> response) {
                 if (onComplete != null) onComplete.run();
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<String>> call, Throwable t) {
+            public void onFailure(Call<ServiceRESTResponse<String>> call, @NonNull final Exception e) {
                 if (onFailed != null) {
-                    onFailed.run(new Exception(t));
+                    onFailed.run(e);
                 }
             }
         });
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/handler/ManagedErrorCallback.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/handler/ManagedErrorCallback.java
new file mode 100644
index 00000000..a2fe946b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/handler/ManagedErrorCallback.java
@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.handler;
+
+import androidx.annotation.NonNull;
+
+import java.net.ConnectException;
+
+import it.integry.integrywmsnative.core.exception.InvalidConnectionException;
+import it.integry.integrywmsnative.core.exception.NoPrintersFoundException;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+public abstract class ManagedErrorCallback<T> implements Callback<T> {
+
+    @Override
+    public void onFailure(Call<T> call, Throwable t) {
+        if (t instanceof ConnectException connectException) {
+            t = new InvalidConnectionException(RESTBuilder.getDefaultHost(), RESTBuilder.getDefaultPort(), connectException);
+        } else if (t.getMessage() != null && t.getMessage().contains("Printer not found")) {
+            t = new NoPrintersFoundException();
+        }
+
+        onFailure(call, (Exception) t);
+    }
+
+    public abstract void onFailure(Call<T> call, @NonNull final Exception e);
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/Stash.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/Stash.java
index 9b9dd969..7aeb8cd7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/Stash.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/Stash.java
@@ -219,7 +219,7 @@ public class Stash {
             Type type = new GenericType(tClass);
             return (ArrayList<T>) gson.fromJson(data, type);
         }
-        return new ArrayList<T>();
+        return new ArrayList<>();
     }
 
     //clear single value
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLiveData.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLiveData.java
index b84a6faa..3afcd18b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLiveData.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLiveData.java
@@ -6,7 +6,7 @@ import androidx.lifecycle.Observer;
 public class UtilityLiveData {
 
     public static <T> void observeOnce(final LiveData<T> liveData, final Observer<T> observer) {
-        liveData.observeForever(new Observer<T>() {
+        liveData.observeForever(new Observer<>() {
             @Override
             public void onChanged(T t) {
                 liveData.removeObserver(this);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityString.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityString.java
index a273c07f..fdd64cfa 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityString.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityString.java
@@ -15,7 +15,7 @@ import java.util.regex.Pattern;
  */
 
 public class UtilityString {
-    private static final Map<String, String> DATE_FORMAT_REGEXPS = new HashMap<String, String>() {{
+    private static final Map<String, String> DATE_FORMAT_REGEXPS = new HashMap<>() {{
 
         //-----------------------------------------------------------------------------------------
         //giorno-mese-giorno
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/BolleAccettazioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/BolleAccettazioneRESTConsumer.java
index 7bae2e9f..b34c61e7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/BolleAccettazioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/BolleAccettazioneRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest;
 
+import androidx.annotation.NonNull;
+
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -7,6 +9,7 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoArticoliAccettazioneBollaRequestDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoArticoliAccettazioneBollaResponseDTO;
@@ -14,7 +17,6 @@ import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.Retri
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.SitBollaAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.TestataBollaAccettazioneDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -24,15 +26,15 @@ public class BolleAccettazioneRESTConsumer extends _BaseRESTConsumer {
     public void retrieveBolleDaAccettare(RunnableArgs<List<TestataBollaAccettazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         BolleAccettazioneRESTConsumerService service = RESTBuilder.getService(BolleAccettazioneRESTConsumerService.class);
         service.retrieveElencoBolle()
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<RetrieveElencoBolleAccettazioneResponseDTO>> call, Response<ServiceRESTResponse<RetrieveElencoBolleAccettazioneResponseDTO>> response) {
                         analyzeAnswer(response, "retrieveBolleDaAccettare", data -> onComplete.run(data.getBolleDaAccettare()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<RetrieveElencoBolleAccettazioneResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<RetrieveElencoBolleAccettazioneResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -44,15 +46,15 @@ public class BolleAccettazioneRESTConsumer extends _BaseRESTConsumer {
                 .setBolle(bolle);
 
         service.retrievePickingListBolle(request)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<RetrieveElencoArticoliAccettazioneBollaResponseDTO>> call, Response<ServiceRESTResponse<RetrieveElencoArticoliAccettazioneBollaResponseDTO>> response) {
                         analyzeAnswer(response, "retrievePickingListBolle", data -> onComplete.run(data.getSitArticoli()), onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<RetrieveElencoArticoliAccettazioneBollaResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<RetrieveElencoArticoliAccettazioneBollaResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/rest/AccettazioneBollaPickingRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/rest/AccettazioneBollaPickingRESTConsumer.java
index 709e3d94..a0c9b3d4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/rest/AccettazioneBollaPickingRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/rest/AccettazioneBollaPickingRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.gest.accettazione_bolla_picking.rest;
 
+import androidx.annotation.NonNull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -7,15 +9,15 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.TestataBollaAccettazioneDTO;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.RetrieveAlreadyRegisteredULAccettazioneBollaRequestDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -33,7 +35,7 @@ public class AccettazioneBollaPickingRESTConsumer extends _BaseRESTConsumer {
                 .setBolle(bolle);
 
         service.retrieveAlreadyRegisteredUDC(request)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO>> call, Response<ServiceRESTResponse<RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO>> response) {
                         analyzeAnswer(response, "retrieveAlreadyRegisteredUDC",
@@ -42,8 +44,8 @@ public class AccettazioneBollaPickingRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/rest/OrdiniAccettazioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/rest/OrdiniAccettazioneRESTConsumer.java
index 374ad9f5..d2ecec03 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/rest/OrdiniAccettazioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/rest/OrdiniAccettazioneRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.gest.accettazione_ordini_elenco.rest;
 
+import androidx.annotation.NonNull;
+
 import com.annimon.stream.Stream;
 
 import java.util.List;
@@ -9,13 +11,12 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.GetPickingListAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.OrdineAccettazioneInevasoDTO;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.SitArtOrdDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -24,15 +25,15 @@ public class OrdiniAccettazioneRESTConsumer extends _BaseRESTConsumer {
 
     public void getOrdiniInevasi(String codMdep, RunnableArgs<List<OrdineAccettazioneInevasoDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
-        service.listOrdiniInevasi(codMdep, "A").enqueue(new Callback<>() {
+        service.listOrdiniInevasi(codMdep, "A").enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<OrdineAccettazioneInevasoDTO>>> call, Response<ServiceRESTResponse<List<OrdineAccettazioneInevasoDTO>>> response) {
                 analyzeAnswer(response, "getOrdiniInevasi", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<OrdineAccettazioneInevasoDTO>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<OrdineAccettazioneInevasoDTO>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -47,16 +48,15 @@ public class OrdiniAccettazioneRESTConsumer extends _BaseRESTConsumer {
                 .toList();
 
         OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
-        service.getArticoliFromOrdiniAccettazione(getPickingListDTOs).enqueue(new Callback<ServiceRESTResponse<List<SitArtOrdDTO>>>() {
+        service.getArticoliFromOrdiniAccettazione(getPickingListDTOs).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
                 analyzeAnswer(response, "retrieveListaArticoliFromOrdiniAccettazione", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Throwable t) {
-                UtilityLogger.error(new Exception(t));
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/rest/AccettazioneOrdiniPickingRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/rest/AccettazioneOrdiniPickingRESTConsumer.java
index 1ec0f5ee..5ba8e603 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/rest/AccettazioneOrdiniPickingRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/rest/AccettazioneOrdiniPickingRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.gest.accettazione_ordini_picking.rest;
 
+import androidx.annotation.NonNull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -11,12 +13,12 @@ import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.OrdineAccettazioneInevasoDTO;
 import it.integry.integrywmsnative.gest.accettazione_ordini_picking.dto.RetrieveAlreadyRegisteredULAccettazioneOrdineRequestDTO;
 import it.integry.integrywmsnative.gest.accettazione_ordini_picking.dto.RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -36,7 +38,7 @@ public class AccettazioneOrdiniPickingRESTConsumer extends _BaseRESTConsumer {
                 .setOrdini(ordiniToShow);
 
         service.retrieveAlreadyRegisteredUDC(request)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO>> call, Response<ServiceRESTResponse<RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO>> response) {
                         analyzeAnswer(response, "retrieveAlreadyRegisteredUDC",
@@ -45,8 +47,8 @@ public class AccettazioneOrdiniPickingRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumer.java
index d9bb33a5..b550275f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumer.java
@@ -6,17 +6,16 @@ import java.util.List;
 
 import javax.inject.Singleton;
 
-import it.integry.integrywmsnative.core.exception.RestException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.RetrieveLottiDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -30,15 +29,15 @@ public class DocInterniRESTConsumer extends _BaseRESTConsumer {
 
     public void getDocInterniSetup(RunnableArgs<DocInterniSetupDTO> onComplete, RunnableArgs<Exception> onFailed) {
         DocInterniRESTConsumerService service = RESTBuilder.getService(DocInterniRESTConsumerService.class);
-        service.getSetupDocInterni().enqueue(new Callback<>() {
+        service.getSetupDocInterni().enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<DocInterniSetupDTO>> call, Response<ServiceRESTResponse<DocInterniSetupDTO>> response) {
                 analyzeAnswer(response, "getSetupDocInterni", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<DocInterniSetupDTO>> call, Throwable t) {
-                onFailed.run(new RestException(t.getMessage()));
+            public void onFailure(Call<ServiceRESTResponse<DocInterniSetupDTO>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -46,15 +45,15 @@ public class DocInterniRESTConsumer extends _BaseRESTConsumer {
     public void retrieveLotti(String codProd, RunnableArgs<List<RetrieveLottiDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         DocInterniRESTConsumerService service = RESTBuilder.getService(DocInterniRESTConsumerService.class);
         service.retrieveLotti(codProd)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(@NonNull Call<ServiceRESTResponse<List<RetrieveLottiDTO>>> call, @NonNull Response<ServiceRESTResponse<List<RetrieveLottiDTO>>> response) {
                         analyzeAnswer(response, "retrieveLotti", onComplete, onFailed);
                     }
 
                     @Override
-                    public void onFailure(@NonNull Call<ServiceRESTResponse<List<RetrieveLottiDTO>>> call, @NonNull Throwable t) {
-                        onFailed.run(new RestException(t.getMessage()));
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<List<RetrieveLottiDTO>>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumer.java
index 67a9070e..043ecf1a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumer.java
@@ -1,6 +1,6 @@
 package it.integry.integrywmsnative.gest.login.rest;
 
-import android.util.Log;
+import androidx.annotation.NonNull;
 
 import javax.inject.Singleton;
 
@@ -8,12 +8,12 @@ import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO;
-import it.integry.integrywmsnative.gest.login.dto.LoginResponseDTO;
 import it.integry.integrywmsnative.gest.login.dto.LoginRequestDTO;
+import it.integry.integrywmsnative.gest.login.dto.LoginResponseDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -27,16 +27,15 @@ public class LoginRESTConsumer extends _BaseRESTConsumer {
         int port = CommonConst.Login.Azienda.port;
 
         LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, protocol, host, port, false, true);
-        service.loginAzienda(codAzienda).enqueue(new Callback<>() {
+        service.loginAzienda(codAzienda).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<LoginAziendaDTO>> call, Response<ServiceRESTResponse<LoginAziendaDTO>> response) {
                 analyzeAnswer(response, "LoginAzienda", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<LoginAziendaDTO>> call, Throwable t) {
-                Log.e("LoginAzienda", t.toString());
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<LoginAziendaDTO>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -49,7 +48,7 @@ public class LoginRESTConsumer extends _BaseRESTConsumer {
                 .setUsername(username)
                 .setPassword(password);
 
-        service.login(loginRequestDTO).enqueue(new Callback<>() {
+        service.login(loginRequestDTO).enqueue(new ManagedErrorCallback<>() {
 
             @Override
             public void onResponse(Call<ServiceRESTResponse<LoginResponseDTO>> call, Response<ServiceRESTResponse<LoginResponseDTO>> response) {
@@ -57,9 +56,8 @@ public class LoginRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<LoginResponseDTO>> call, final Throwable t) {
-                Log.e("Login", t.toString());
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<LoginResponseDTO>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/rest/OrdiniUscitaElencoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/rest/OrdiniUscitaElencoRESTConsumer.java
index ecd3475f..48330288 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/rest/OrdiniUscitaElencoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/rest/OrdiniUscitaElencoRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.gest.ordini_uscita_elenco.rest;
 
+import androidx.annotation.NonNull;
+
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -10,9 +12,9 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -27,7 +29,7 @@ public class OrdiniUscitaElencoRESTConsumer extends _BaseRESTConsumer {
                 testataCollo.getGestione(),
                 GestioneEnum.VENDITA.getText(),
                 codMdep)
-                .enqueue(new Callback<ServiceRESTResponse<List<DtbOrdt>>>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<DtbOrdt>>> call, Response<ServiceRESTResponse<List<DtbOrdt>>> response) {
                         analyzeAnswer(response, "getOrdiniFromCommessaCollo", (m) -> {
@@ -36,8 +38,8 @@ public class OrdiniUscitaElencoRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<DtbOrdt>>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<List<DtbOrdt>>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/rest/ProdOrdineProduzioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/rest/ProdOrdineProduzioneRESTConsumer.java
index eaaf8dec..79c6db62 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/rest/ProdOrdineProduzioneRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/rest/ProdOrdineProduzioneRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.rest;
 
+import androidx.annotation.NonNull;
+
 import com.annimon.stream.Stream;
 
 import java.util.List;
@@ -9,14 +11,13 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.GetPickingListAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.OrdineAccettazioneInevasoDTO;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.SitArtOrdDTO;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.rest.OrdiniAccettazioneRESTConsumerService;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -24,15 +25,15 @@ public class ProdOrdineProduzioneRESTConsumer extends _BaseRESTConsumer {
 
     public void getOrdiniInevasi(String codMdep, RunnableArgs<List<OrdineAccettazioneInevasoDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
-        service.listOrdiniInevasi(codMdep, "P").enqueue(new Callback<>() {
+        service.listOrdiniInevasi(codMdep, "P").enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<OrdineAccettazioneInevasoDTO>>> call, Response<ServiceRESTResponse<List<OrdineAccettazioneInevasoDTO>>> response) {
                 analyzeAnswer(response, "getOrdiniInevasi", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<OrdineAccettazioneInevasoDTO>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<OrdineAccettazioneInevasoDTO>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
@@ -47,16 +48,15 @@ public class ProdOrdineProduzioneRESTConsumer extends _BaseRESTConsumer {
                 .toList();
 
         OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
-        service.getArticoliFromOrdiniAccettazione(getPickingListDTOs).enqueue(new Callback<>() {
+        service.getArticoliFromOrdiniAccettazione(getPickingListDTOs).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
                 analyzeAnswer(response, "retrieveListaArticoliFromOrdiniProduzione", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Throwable t) {
-                UtilityLogger.error(new Exception(t));
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java
index 8f54b725..805eb001 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest;
 
+import androidx.annotation.NonNull;
+
 import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
@@ -11,15 +13,13 @@ import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
-import it.integry.integrywmsnative.core.rest.consumers.MagazzinoBufferRESTConsumerService;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -35,7 +35,7 @@ public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
     public void loadFabbisogno(String numOrd, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         ProdFabbisognoLineeProdRESTConsumerService prodFabbisognoLineeProdRESTConsumerService = RESTBuilder.getService(ProdFabbisognoLineeProdRESTConsumerService.class);
         prodFabbisognoLineeProdRESTConsumerService.loadFabbisogno(numOrd, codMdep)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> call,
                                            Response<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> response) {
@@ -43,8 +43,8 @@ public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
index e737c161..c990983b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
@@ -360,15 +360,14 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
 
     public Drawable getOrderStatusIcon() {
         if (currentOrder.getValue() != null) {
-            switch (currentOrder.getValue().getStatoEnum()) {
-                case IN_CORSO:
-                    return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_play_circle_filled_24dp);
-                case PAUSA:
-                    return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_pause_circle_filled_24dp);
-                case PROGRAMMATO:
-                default:
-                    return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_clock_circle_outline_24dp);
-            }
+            return switch (currentOrder.getValue().getStatoEnum()) {
+                case IN_CORSO ->
+                        ContextCompat.getDrawable(requireActivity(), R.drawable.ic_play_circle_filled_24dp);
+                case PAUSA ->
+                        ContextCompat.getDrawable(requireActivity(), R.drawable.ic_pause_circle_filled_24dp);
+                default ->
+                        ContextCompat.getDrawable(requireActivity(), R.drawable.ic_clock_circle_outline_24dp);
+            };
         } else
             return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_clock_circle_outline_24dp);
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java
index a722b1bc..60e83ad6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java
@@ -1,10 +1,10 @@
 package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest;
 
+import androidx.annotation.NonNull;
 import androidx.databinding.ObservableArrayList;
 
 import com.annimon.stream.Stream;
 import com.google.gson.reflect.TypeToken;
-import com.orhanobut.logger.Logger;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -21,13 +21,13 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.core.utility.UtilityQuery;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.dto.ImportColliDaProduzioneRequestDTO;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -113,7 +113,7 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
 
         ProdRientroMerceOrderDetailRESTConsumerService service = RESTBuilder.getService(ProdRientroMerceOrderDetailRESTConsumerService.class);
         service.importColliDaProduzione(Collections.singletonList(importColliDaProduzioneRequestDTO))
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
                         analyzeAnswerList(response, "importColliDaProduzione", mtbColt -> {
@@ -124,9 +124,8 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, Throwable t) {
-                        Logger.e(t, "importColliDaProduzione");
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }
@@ -134,7 +133,7 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
 
     public void deleteColloDaProduzione(MtbColt mtbColtToDelete, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         ProdRientroMerceOrderDetailRESTConsumerService service = RESTBuilder.getService(ProdRientroMerceOrderDetailRESTConsumerService.class);
-        service.deleteColloDaProduzione(mtbColtToDelete).enqueue(new Callback<ServiceRESTResponse<Object>>() {
+        service.deleteColloDaProduzione(mtbColtToDelete).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                 analyzeAnswer(response, "deleteColloDaProduzione", mtbColt -> {
@@ -145,9 +144,8 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
-                Logger.e(t, "deleteColloDaProduzione");
-                onFailed.run(new Exception(t));
+            public void onFailure(Call<ServiceRESTResponse<Object>> call, @NonNull final Exception e) {
+                onFailed.run(e);
             }
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java
index 3ed3faa7..98f0ea06 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.gest.rettifica_giacenze.rest;
 
+import androidx.annotation.NonNull;
+
 import com.annimon.stream.Stream;
 import com.google.gson.reflect.TypeToken;
 
@@ -16,6 +18,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.SaveDocFromPickingRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.FornitoreDTO;
@@ -24,7 +27,6 @@ import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.SearchArticoloByB
 import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.SearchArticoloByCodArtFornOrDescrizioneRequestDTO;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.SearchArticoloByCodArtFornOrDescrizioneResponseDTO;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
@@ -53,7 +55,7 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
         service.searchByCodArtFornOrDescrizione(new SearchArticoloByCodArtFornOrDescrizioneRequestDTO()
                         .setCodAlis(codAlis)
                         .setCodArtFornOrDescrizione(codArtForOrDescr))
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<SearchArticoloByCodArtFornOrDescrizioneResponseDTO>>> call,
                                            Response<ServiceRESTResponse<List<SearchArticoloByCodArtFornOrDescrizioneResponseDTO>>> response) {
@@ -61,8 +63,8 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<SearchArticoloByCodArtFornOrDescrizioneResponseDTO>>> call, Throwable t) {
-                        onError.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<List<SearchArticoloByCodArtFornOrDescrizioneResponseDTO>>> call, @NonNull final Exception e) {
+                        onError.run(e);
                     }
                 });
 
@@ -75,7 +77,7 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
         final RettificaGiacenzeRESTConsumerService service = RESTBuilder.getService(RettificaGiacenzeRESTConsumerService.class);
         service.searchByCodMartOrBarcode(new SearchArticoloByBarcodeOrCodMartRequestDTO()
                         .setCodMartOrBarcode(codMartOrBarcodeOrDescr))
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<SearchArticoloByBarcodeOrCodMartResponseDTO>>> call,
                                            Response<ServiceRESTResponse<List<SearchArticoloByBarcodeOrCodMartResponseDTO>>> response) {
@@ -96,8 +98,8 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<SearchArticoloByBarcodeOrCodMartResponseDTO>>> call, Throwable t) {
-                        onError.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<List<SearchArticoloByBarcodeOrCodMartResponseDTO>>> call, @NonNull final Exception e) {
+                        onError.run(e);
                     }
                 });
     }
@@ -110,15 +112,15 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
 
         final RettificaGiacenzeRESTConsumerService service = RESTBuilder.getService(RettificaGiacenzeRESTConsumerService.class);
         service.saveDocFromPickingPvm(request)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                         analyzeAnswerList(response, "saveDocFromPickingPvm", data -> onComplete.run(), onError);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
-                        onError.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onError.run(e);
                     }
                 });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/fastscroll/RecyclerViewScrollListener.java b/app/src/main/java/it/integry/integrywmsnative/ui/fastscroll/RecyclerViewScrollListener.java
index 9d70508f..8768be03 100644
--- a/app/src/main/java/it/integry/integrywmsnative/ui/fastscroll/RecyclerViewScrollListener.java
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/fastscroll/RecyclerViewScrollListener.java
@@ -5,10 +5,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Created by Michal on 04/08/16.
- * Responsible for updating the handle / bubble position when user scrolls the {@link android.support.v7.widget.RecyclerView}.
- */
 public class RecyclerViewScrollListener extends RecyclerView.OnScrollListener {
 
     private final FastScroller scroller;
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java
index 94e39eb8..aca61953 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java
@@ -8,7 +8,7 @@ public class TracciamentoImballoDTO {
     private final ObservableField<String> codTcol = new ObservableField<>();
     private final ObservableField<String> descrizione = new ObservableField<>();
     private final ObservableField<String> codMart = new ObservableField<>();
-    private final ObservableField<Integer> qta = new ObservableField<Integer>();
+    private final ObservableField<Integer> qta = new ObservableField<>();
 
     private final ObservableBoolean editable = new ObservableBoolean(true);
 
diff --git a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
index 5ec6ff88..2b88eeaf 100644
--- a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
@@ -1158,6 +1158,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/add_unit"
+                                android:layout_marginStart="8dp"
                                 app:icon="@drawable/ic_add_24dp"
                                 app:singleClick="@{() -> view.addSingleUnitButtonClick()}" />
 
diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
index 7fa714e0..d60b1534 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
@@ -178,7 +178,7 @@
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{&quot;#&quot; + mtbColr.numColloRif + &quot; (&quot; + mtbColr.serCollo + &quot;)&quot;}"
+                        android:text="@{&quot;#&quot; + mtbColr.numColloRif + &quot; (&quot; + mtbColr.serColloRif + &quot;)&quot;}"
                         android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                         android:singleLine="true"
                         android:ellipsize="end"
@@ -187,7 +187,7 @@
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{GestioneToTextConverter.convert(mtbColr.gestioneEnum)}"
+                        android:text="@{GestioneToTextConverter.convert(mtbColr.gestioneRifEnum)}"
                         android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                         android:textColor="?attr/colorOutline"
                         tools:text="Lavorazione"/>
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
index 294f002c..8c36d9b7 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
@@ -739,6 +739,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/add_unit"
+                            android:layout_marginStart="8dp"
                             app:icon="@drawable/ic_add_24dp"
                             app:singleClick="@{() -> view.addSingleUnitButtonClick()}" />
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 533a98a7..0b70fac6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -380,8 +380,8 @@
     <string name="cod_alis_name">Griglia: </string>
     <string name="seleziona_crea_ordine_a_pv">Seleziona / Crea ordine</string>
     <string name="add">Aggiungi</string>
-    <string name="add_lu">Aggiungi pedana</string>
-    <string name="add_unit">Aggiungi unità</string>
+    <string name="add_lu">Agg. pedana</string>
+    <string name="add_unit">Agg. unità</string>
     <string name="action_close">Chiudi</string>
     <string name="close_and_export">Chiudi ed esporta ordine</string>
     <string name="close_and_exit">Chiudi ordine</string>
diff --git a/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java b/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java
index b79d43fd..8c482b60 100644
--- a/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java
+++ b/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java
@@ -40,7 +40,7 @@ public class HoneyWellBarcodeReader implements BarcodeReaderInterface {
     @Override
     public boolean isRightAdapter() {
         String model = Build.MODEL;
-        List<String> compatibleModels = new ArrayList<String>();
+        List<String> compatibleModels = new ArrayList<>();
         compatibleModels.add("EDA50");
         compatibleModels.add("EDA51");
         compatibleModels.add("EDA52");

From c6a2b8c6eaabbf97fbe13567a23816a663cbacfa Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Fri, 24 Jan 2025 18:36:47 +0100
Subject: [PATCH 090/103] In accettazione bolla fatto in modo che vengono
 riconosciuti i kit quando leggono i componenti

---
 .../rest/consumers/ArticoloRESTConsumer.java  | 21 +++++++++++++++++++
 .../ArticoloRESTConsumerService.java          |  3 +++
 .../rest/dto/SitBollaAccettazioneDTO.java     | 19 +++++++++++++++++
 .../AccettazioneBollaPickingViewModel.java    | 14 +++++++++----
 .../AccettazioneBollaPickingListAdapter.java  |  4 ++--
 5 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
index 87db9581..47e625b5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import com.annimon.stream.Stream;
 import com.google.gson.reflect.TypeToken;
 
@@ -98,6 +100,25 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
                 });
     }
 
+    public void findIfIsKit(MtbAart mtbAart, RunnableArgs<MtbAart> onComplete, RunnableArgs<Exception> onFailed){
+        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+
+        articoloRESTConsumerService
+                .findIfIsKit(mtbAart)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<MtbAart>> call, @NonNull Response<ServiceRESTResponse<MtbAart>> response) {
+                        analyzeAnswer(response, "findIfIsKit", (m) -> {
+                            onComplete.run(response.body().getDto());
+                        }, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<MtbAart>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 
     public void getByCodMarts(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
         getByCodMartsStatic(codMartToFind, onComplete, onFailed);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java
index c497adc6..1c273ff6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java
@@ -31,6 +31,9 @@ public interface ArticoloRESTConsumerService {
     @POST("wms/articolo/searchByBarcode")
     Call<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> searchByBarcode(@Body() SearchArticoloByBarcodeRequestDTO searchArticoloByBarcodeRequest);
 
+    @POST("wms/articolo/findIfIsKit")
+    Call<ServiceRESTResponse<MtbAart>> findIfIsKit(@Body MtbAart mtbAart);
+
     @POST("wms/articolo/retrieveByCodMart")
     Call<ServiceRESTResponse<List<MtbAart>>> getByCodMart(@Body RetrieveArticoloByCodMartRequestDTO retrieveArticoloByCodMartRequest);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/dto/SitBollaAccettazioneDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/dto/SitBollaAccettazioneDTO.java
index feb85589..8cf0e716 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/dto/SitBollaAccettazioneDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/dto/SitBollaAccettazioneDTO.java
@@ -19,6 +19,9 @@ public class SitBollaAccettazioneDTO {
     private BigDecimal qtaDaAccettare;
     private BigDecimal numCnfDaAccettare;
 
+    private boolean kit;
+    private boolean componente;
+
     public int getNumDoc() {
         return numDoc;
     }
@@ -126,4 +129,20 @@ public class SitBollaAccettazioneDTO {
         this.numCnfDaAccettare = numCnfDaAccettare;
         return this;
     }
+
+    public boolean isKit() {
+        return kit;
+    }
+
+    public void setKit(boolean kit) {
+        this.kit = kit;
+    }
+
+    public boolean isComponente() {
+        return componente;
+    }
+
+    public void setComponente(boolean componente) {
+        this.componente = componente;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
index aec586ae..cf7f146b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
@@ -338,8 +338,14 @@ public class AccettazioneBollaPickingViewModel {
     }
 
     private void loadMatchedRows(List<PickingObjectDTO> matchedRows, MtbAart mtbAart, PickDataDTO pickDataDTO) {
-        if (matchedRows == null || matchedRows.size() == 0) {
-            manageNoArtFound(mtbAart, pickDataDTO);
+        if (matchedRows == null || matchedRows.isEmpty()) {
+            this.mArticoloRESTConsumer.findIfIsKit(mtbAart, mtbAartFind -> {
+                if (mtbAartFind == null){
+                    manageNoArtFound(mtbAart, pickDataDTO);
+                } else {
+                    searchArtFromAnag(mtbAartFind, pickDataDTO, () -> {});
+                }
+            }, this::sendError);
         } else if (matchedRows.size() == 1) {
             this.manageDispatchBollaRow(matchedRows.get(0));
         } else {
@@ -662,8 +668,8 @@ public class AccettazioneBollaPickingViewModel {
                     .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
                     .setMtbAart(pickingObjectDTO.getMtbAart());
 
-            pickingObjectDTO.getWithdrawMtbColrs().add(insertedMtbColr);
-            mCurrentMtbColt.getMtbColr().add(insertedMtbColr);
+            pickingObjectDTO.getWithdrawMtbColrs().add(0, insertedMtbColr);
+            mCurrentMtbColt.getMtbColr().add(0, insertedMtbColr);
 
             //Chiamato removeListFilter perché cosi mi cancella tutti i dati di pick temporanei
             resetMatchedRows();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
index 3b81d9c4..8ef41338 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
@@ -77,8 +77,8 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
 
                     Collections.sort(listaOrdinata, (a, b) -> {
 
-                        boolean condA = a.getQtaEvasa().subtract(a.getQtaTot()).floatValue() == 0;
-                        boolean condB = b.getQtaEvasa().subtract(b.getQtaTot()).floatValue() == 0;
+                        boolean condA = a.getQtaEvasa().floatValue() > 0;
+                        boolean condB = b.getQtaEvasa().floatValue() > 0;
 
                         if (condA && !condB) {
                             return -1;

From f390548d66bae8ad1a66b1bf93f6622ab6ac5335 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Fri, 24 Jan 2025 18:38:22 +0100
Subject: [PATCH 091/103] -> v1.43.02 (467)

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

diff --git a/app/build.gradle b/app/build.gradle
index 46a2adbf..5817e59e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 466
-    def appVersionName = '1.43.01'
+    def appVersionCode = 467
+    def appVersionName = '1.43.02'
 
     signingConfigs {
         release {

From e85e05a526271c65cf387563908f011f3a9d9502 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 27 Jan 2025 13:04:15 +0100
Subject: [PATCH 092/103] Aggiunto filtro commessa in Rientro Merce

---
 .../MainApplicationComponent.java             |   3 +
 .../rest/consumers/CommessaRESTConsumer.java  |  14 +-
 ... => OrdiniUscitaElencoFilterBindings.java} |   4 +-
 .../OrdiniUscitaElencoFragment.java           |  79 ++++----
 ...=> OrdiniUscitaElencoFiltroViewModel.java} |   2 +-
 .../ProdOrdineProduzioneElencoBindings.java   |   2 +-
 .../ProdOrdineProduzioneElencoFragment.java   |   2 +-
 .../ProdFabbisognoLineeProdBindings.java      |   1 -
 .../ProdFabbisognoLineeProdFragment.java      |  22 +--
 ...rodFabbisognoLineeProdFilterViewModel.java |  13 +-
 .../ProdRientroMerceFragment.java             |  22 ++-
 .../ProdRientroMerceViewModel.java            |   4 +
 .../ProdRientroMerceOrderDetailFragment.java  |   4 +
 .../ProdRientroMerceOrderDetailViewModel.java |  22 ++-
 .../ProdRientroMerceOrderListComponent.java   |  15 ++
 ...odRientroMerceOrderListFilterBindings.java |  19 ++
 ...dRientroMerceOrderListFilterViewModel.java | 113 +++++++++++
 .../ProdRientroMerceOrderListFragment.java    | 185 +++++++++++++++++-
 .../dto/OrdineLavorazioneDTO.java             |   6 +-
 .../ui/filter_chips/FilterLayoutView.java     |  13 ++
 .../filters/FilterCommessaLayoutView.java     |  19 +-
 ...agment_prod_rientro_merce_order_detail.xml |   2 +-
 .../layout/fragment_main_ordini_uscita.xml    |   4 +-
 ...agment_prod_rientro_merce_order_detail.xml |   2 +-
 ...fragment_prod_rientro_merce_order_list.xml |  35 +++-
 .../res/layout/layout_filter_commessa.xml     |   4 +-
 .../layout_filter_commessa__list_item.xml     |   2 +-
 27 files changed, 492 insertions(+), 121 deletions(-)
 rename app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/{OrdiniUscitaElencoBindings.java => OrdiniUscitaElencoFilterBindings.java} (96%)
 rename app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/{VenditaFiltroOrdiniViewModel.java => OrdiniUscitaElencoFiltroViewModel.java} (99%)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListComponent.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterBindings.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterViewModel.java
 rename app/src/main/java/it/integry/integrywmsnative/{gest/prod_accettazione_ord_produzione => ui/filter_chips}/filters/FilterCommessaLayoutView.java (91%)

diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
index 22f18092..07e82282 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
@@ -71,6 +71,7 @@ import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMate
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeModule;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceComponent;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailComponent;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.order_list.ProdRientroMerceOrderListComponent;
 import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.ProdRiposizionamentoDaProdComponent;
 import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.ProdRiposizionamentoDaProdModule;
 import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dialogs.info_giacenza.DialogInfoGiacenzaComponent;
@@ -379,6 +380,8 @@ public interface MainApplicationComponent {
 
     DialogSwitchUserDepoComponent.Factory dialogSwitchUserDepoComponent();
 
+    ProdRientroMerceOrderListComponent.Factory prodRientroMerceOrderListComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/CommessaRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/CommessaRESTConsumer.java
index 91bf0da0..2397e97e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/CommessaRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/CommessaRESTConsumer.java
@@ -1,12 +1,12 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import com.annimon.stream.Stream;
 import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.inject.Singleton;
 
@@ -26,15 +26,15 @@ public class CommessaRESTConsumer extends _BaseRESTConsumer {
 
 
     public void getJtbComts(List<String> itemsToFind, RunnableArgs<List<JtbComt>> onComplete, RunnableArgs<Exception> onFailed) {
-        var whereCondMap = Stream.of(itemsToFind)
-                .withoutNulls()
+        var whereCondMap = itemsToFind.stream()
                 .filter(x -> !UtilityString.isNullOrEmpty(x))
                 .map(x -> {
-                    HashMap<String, Object> vars = new HashMap<>();
-                    vars.put("cod_jcom", x);
-                    return vars;
+                    HashMap<String, Object> codJcom = new HashMap<>() {{
+                        put("cod_jcom", x);
+                    }};
+                    return codJcom;
                 })
-                .toList();
+                .collect(Collectors.toUnmodifiableList());
 
         if(whereCondMap.isEmpty()) {
             onComplete.run(new ArrayList<>());
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoBindings.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFilterBindings.java
similarity index 96%
rename from app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoBindings.java
rename to app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFilterBindings.java
index b4426983..1495d1d3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoBindings.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFilterBindings.java
@@ -12,10 +12,10 @@ import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterPaese
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterTermConsLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterVettoreLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterViaggioLayoutView;
-import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.FilterCommessaLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterCommessaLayoutView;
 import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
 
-public class OrdiniUscitaElencoBindings {
+public class OrdiniUscitaElencoFilterBindings {
 
 
     public static final int DEPOSITO_FILTER_ID = 0;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
index abcfb925..f60e7674 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
@@ -17,10 +17,12 @@ import com.annimon.stream.Stream;
 import com.google.android.material.datepicker.MaterialDatePicker;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -63,10 +65,10 @@ import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterPaese
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterTermConsLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterVettoreLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterViaggioLayoutView;
-import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.VenditaFiltroOrdiniViewModel;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.OrdiniUscitaElencoFiltroViewModel;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.ui.OrdiniUscitaElencoAdapter;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.ui.OrdiniUscitaElencoListModel;
-import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.FilterCommessaLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterCommessaLayoutView;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneActivity;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRowInfoView;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
@@ -91,7 +93,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     @Inject
     OrdiniUscitaElencoViewModel mViewModel;
 
-    private final VenditaFiltroOrdiniViewModel mAppliedFilterViewModel = new VenditaFiltroOrdiniViewModel();
+    private final OrdiniUscitaElencoFiltroViewModel mAppliedFilterViewModel = new OrdiniUscitaElencoFiltroViewModel();
 
     private FragmentMainOrdiniUscitaBinding mBindings = null;
 
@@ -277,10 +279,10 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
         mAppliedFilterViewModel.getCurrentGruppoMercPredicate().addOnPropertyChangedCallback(onPredicateChanged);
         mAppliedFilterViewModel.getCurrentCommessaPredicate().addOnPropertyChangedCallback(onPredicateChanged);
 
-        List<FilterChipDTO> filterList = Stream.of(OrdiniUscitaElencoBindings.AVAILABLE_FILTERS.entrySet())
+        List<FilterChipDTO> filterList = OrdiniUscitaElencoFilterBindings.AVAILABLE_FILTERS.entrySet().stream()
                 .map(Map.Entry::getValue)
-                .sortBy(FilterChipDTO::getPosizione)
-                .toList();
+                .sorted(Comparator.comparing(FilterChipDTO::getPosizione))
+                .collect(Collectors.toList());
 
         for (FilterChipDTO filterChipDTO : filterList) {
 
@@ -290,7 +292,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                     v -> initBottomSheetDialogFilter(filterChipDTO));
 
             switch (filterChipDTO.getID()) {
-                case OrdiniUscitaElencoBindings.DEPOSITO_FILTER_ID -> {
+                case OrdiniUscitaElencoFilterBindings.DEPOSITO_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentDepositoPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -311,7 +313,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                     });
                     filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentDepositoPredicate().set(null));
                 }
-                case OrdiniUscitaElencoBindings.VIAGGIO_FILTER_ID -> {
+                case OrdiniUscitaElencoFilterBindings.VIAGGIO_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentIdViaggioPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -332,7 +334,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                     });
                     filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentIdViaggioPredicate().set(null));
                 }
-                case OrdiniUscitaElencoBindings.NUM_ORD_FILTER_ID -> {
+                case OrdiniUscitaElencoFilterBindings.NUM_ORD_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentNumOrdsPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -353,7 +355,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                     });
                     filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentNumOrdsPredicate().set(null));
                 }
-                case OrdiniUscitaElencoBindings.CLIENTE_FILTER_ID -> {
+                case OrdiniUscitaElencoFilterBindings.CLIENTE_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentClientePredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -374,7 +376,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                     });
                     filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentClientePredicate().set(null));
                 }
-                case OrdiniUscitaElencoBindings.VETTORE_FILTER_ID -> {
+                case OrdiniUscitaElencoFilterBindings.VETTORE_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentVettorePredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -395,7 +397,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                     });
                     filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentVettorePredicate().set(null));
                 }
-                case OrdiniUscitaElencoBindings.AUTOMEZZO_FILTER_ID -> {
+                case OrdiniUscitaElencoFilterBindings.AUTOMEZZO_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentAutomezzoPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -416,7 +418,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                     });
                     filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentAutomezzoPredicate().set(null));
                 }
-                case OrdiniUscitaElencoBindings.PAESE_FILTER_ID -> {
+                case OrdiniUscitaElencoFilterBindings.PAESE_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentPaesePredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -437,7 +439,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                     });
                     filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentPaesePredicate().set(null));
                 }
-                case OrdiniUscitaElencoBindings.AGENTE_FILTER_ID -> {
+                case OrdiniUscitaElencoFilterBindings.AGENTE_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentAgentePredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -458,7 +460,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                     });
                     filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentAgentePredicate().set(null));
                 }
-                case OrdiniUscitaElencoBindings.TERM_CONS_FILTER_ID -> {
+                case OrdiniUscitaElencoFilterBindings.TERM_CONS_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentTermConsPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -479,7 +481,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                     });
                     filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentTermConsPredicate().set(null));
                 }
-                case OrdiniUscitaElencoBindings.DATA_CONS_FILTER_ID -> {
+                case OrdiniUscitaElencoFilterBindings.DATA_CONS_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentDataConsPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -503,7 +505,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                         mAppliedFilterViewModel.getCurrentDataConsPredicate().set(null);
                     });
                 }
-                case OrdiniUscitaElencoBindings.GRUPPO_MERC_FILTER_ID -> {
+                case OrdiniUscitaElencoFilterBindings.GRUPPO_MERC_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentGruppoMercPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -527,7 +529,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                         mAppliedFilterViewModel.getCurrentGruppoMercPredicate().set(null);
                     });
                 }
-                case OrdiniUscitaElencoBindings.COMMESSA_FILTER_ID -> {
+                case OrdiniUscitaElencoFilterBindings.COMMESSA_FILTER_ID -> {
                     mAppliedFilterViewModel.getCurrentCommessaPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
                         @Override
                         public void run() {
@@ -560,7 +562,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     }
 
     private void initBottomSheetDialogFilter(FilterChipDTO filterChipDTO) {
-        if (filterChipDTO.getID() == OrdiniUscitaElencoBindings.DATA_CONS_FILTER_ID) {
+        if (filterChipDTO.getID() == OrdiniUscitaElencoFilterBindings.DATA_CONS_FILTER_ID) {
             var datePicker =
                     MaterialDatePicker.Builder.datePicker()
                             .setTitleText(filterChipDTO.getFilterChipText())
@@ -583,7 +585,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                 .getFilterLayoutView();
 
         switch (filterChipDTO.getID()) {
-            case OrdiniUscitaElencoBindings.COMMESSA_FILTER_ID ->
+            case OrdiniUscitaElencoFilterBindings.COMMESSA_FILTER_ID ->
                     ((FilterCommessaLayoutView) filterLayoutView)
                             .setAllCommesse(mAppliedFilterViewModel.getAllCommesse(this.jtbComtCache))
                             .setAvailableCommesse(mAppliedFilterViewModel.getAvailableCommesse(this.jtbComtCache))
@@ -594,7 +596,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                                             mAppliedFilterViewModel.getCurrentCommessaPredicate().get())
                                     .map(x -> Stream.of(jtbComtCache).filter(y -> x.getCodJcom().equalsIgnoreCase(y.getCodJcom())).findFirst().get())
                                     .toList());
-            case OrdiniUscitaElencoBindings.DEPOSITO_FILTER_ID ->
+            case OrdiniUscitaElencoFilterBindings.DEPOSITO_FILTER_ID ->
                     ((FilterDepositoLayoutView) filterLayoutView)
                             .setAllCodMdeps(mAppliedFilterViewModel.getAllCodMdeps(mtbDepoCache))
                             .setAvailableCodMdeps(mAppliedFilterViewModel.getAvailableCodMdeps(mtbDepoCache))
@@ -605,7 +607,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                                             mAppliedFilterViewModel.getCurrentDepositoPredicate().get())
                                     .map(x -> Stream.of(mtbDepoCache).filter(y -> x.getCodMdep().equalsIgnoreCase(y.getCodMdep())).findFirst().get())
                                     .toList());
-            case OrdiniUscitaElencoBindings.VIAGGIO_FILTER_ID ->
+            case OrdiniUscitaElencoFilterBindings.VIAGGIO_FILTER_ID ->
                     ((FilterViaggioLayoutView) filterLayoutView)
                             .setAllIDViaggio(mAppliedFilterViewModel.getAllIDViaggio())
                             .setAvailableIDViaggio(mAppliedFilterViewModel.getAvailableIDViaggio())
@@ -616,7 +618,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                                             mAppliedFilterViewModel.getCurrentIdViaggioPredicate().get())
                                     .map(OrdineUscitaInevasoDTO::getIdViaggio)
                                     .toList());
-            case OrdiniUscitaElencoBindings.NUM_ORD_FILTER_ID ->
+            case OrdiniUscitaElencoFilterBindings.NUM_ORD_FILTER_ID ->
                     ((FilterNumeroOrdineLayoutView) filterLayoutView)
                             .setAllNumOrds(mAppliedFilterViewModel.getAllNumOrds())
                             .setAvailableNumOrds(mAppliedFilterViewModel.getAvailableNumOrds())
@@ -627,7 +629,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                                             mAppliedFilterViewModel.getCurrentNumOrdsPredicate().get())
                                     .map(OrdineUscitaInevasoDTO::getNumOrd)
                                     .toList());
-            case OrdiniUscitaElencoBindings.CLIENTE_FILTER_ID ->
+            case OrdiniUscitaElencoFilterBindings.CLIENTE_FILTER_ID ->
                     ((FilterClienteLayoutView) filterLayoutView)
                             .setAllClienti(mAppliedFilterViewModel.getAllClienti())
                             .setAvailableClienti(mAppliedFilterViewModel.getAvailableClienti())
@@ -638,7 +640,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                                             mAppliedFilterViewModel.getCurrentClientePredicate().get())
                                     .map(OrdineUscitaInevasoDTO::getRagSocOrd)
                                     .toList());
-            case OrdiniUscitaElencoBindings.VETTORE_FILTER_ID ->
+            case OrdiniUscitaElencoFilterBindings.VETTORE_FILTER_ID ->
                     ((FilterVettoreLayoutView) filterLayoutView)
                             .setAllVettori(mAppliedFilterViewModel.getAllVettori())
                             .setAvailableVettori(mAppliedFilterViewModel.getAvailableVettori())
@@ -649,7 +651,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                                             mAppliedFilterViewModel.getCurrentVettorePredicate().get())
                                     .map(x -> x.getCodVvet() + (!UtilityString.isNullOrEmpty(x.getCodVvet()) ? " - " + x.getDescrizioneVettore() : ""))
                                     .toList());
-            case OrdiniUscitaElencoBindings.AUTOMEZZO_FILTER_ID ->
+            case OrdiniUscitaElencoFilterBindings.AUTOMEZZO_FILTER_ID ->
                     ((FilterAutomezzoLayoutView) filterLayoutView)
                             .setAllAutomezzi(mAppliedFilterViewModel.getAllAutomezzi())
                             .setAvailableAutomezzi(mAppliedFilterViewModel.getAvailableAutomezzi())
@@ -660,7 +662,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                                             mAppliedFilterViewModel.getCurrentAutomezzoPredicate().get())
                                     .map(OrdineUscitaInevasoDTO::getDescrizioneAuto)
                                     .toList());
-            case OrdiniUscitaElencoBindings.PAESE_FILTER_ID ->
+            case OrdiniUscitaElencoFilterBindings.PAESE_FILTER_ID ->
                     ((FilterPaeseLayoutView) filterLayoutView)
                             .setAllPaesi(mAppliedFilterViewModel.getAllPaesi())
                             .setAvailablePaesi(mAppliedFilterViewModel.getAvailablePaesi())
@@ -671,7 +673,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                                             mAppliedFilterViewModel.getCurrentPaesePredicate().get())
                                     .map(OrdineUscitaInevasoDTO::getCitta)
                                     .toList());
-            case OrdiniUscitaElencoBindings.AGENTE_FILTER_ID ->
+            case OrdiniUscitaElencoFilterBindings.AGENTE_FILTER_ID ->
                     ((FilterAgenteLayoutView) filterLayoutView)
                             .setAllAgenti(mAppliedFilterViewModel.getAllAgenti())
                             .setAvailableAgenti(mAppliedFilterViewModel.getAvailableAgenti())
@@ -682,7 +684,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                                             mAppliedFilterViewModel.getCurrentAgentePredicate().get())
                                     .map(OrdineUscitaInevasoDTO::getCitta)
                                     .toList());
-            case OrdiniUscitaElencoBindings.TERM_CONS_FILTER_ID ->
+            case OrdiniUscitaElencoFilterBindings.TERM_CONS_FILTER_ID ->
                     ((FilterTermConsLayoutView) filterLayoutView)
                             .setAllTermCons(mAppliedFilterViewModel.getAllTermCons())
                             .setAvailableTermCons(mAppliedFilterViewModel.getAvailableTermCons())
@@ -693,7 +695,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                                             mAppliedFilterViewModel.getCurrentTermConsPredicate().get())
                                     .map(OrdineUscitaInevasoDTO::getCitta)
                                     .toList());
-            case OrdiniUscitaElencoBindings.GRUPPO_MERC_FILTER_ID ->
+            case OrdiniUscitaElencoFilterBindings.GRUPPO_MERC_FILTER_ID ->
                     ((FilterGruppoMercLayoutView) filterLayoutView)
                             .setAllGroupMerc(mAppliedFilterViewModel.getAllGruppoMerc(mtbGrupCache))
                             .setAvailableGroupMerc(mAppliedFilterViewModel.getAvailableGruppoMerc(mtbGrupCache))
@@ -730,7 +732,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
             this.mOrdiniInevasiMutableData.clear();
             this.mOrdiniInevasiMutableData.addAll(list);
 
-            fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
+            fabVisible.set(mOrdiniInevasiMutableData.stream()
                     .anyMatch(y -> y.getSelectedObservable().get()));
         });
     }
@@ -901,12 +903,17 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
             onComplete.run();
             return;
         }
-        var jtbComts = Stream.of(Objects.requireNonNull(this.mViewModel.getOrderList().getValue()))
-                .flatMap(x -> Stream.of(x.getCodJcom()))
-                .distinct().withoutNulls()
-                .toList();
 
-        if (jtbComts.isEmpty()) {
+        List<String> jtbComts = null;
+        if(this.mViewModel.getOrderList().getValue() != null) {
+            jtbComts = this.mViewModel.getOrderList().getValue().stream()
+                    .map(OrdineUscitaInevasoDTO::getCodJcom)
+                    .distinct()
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toUnmodifiableList());
+        }
+
+        if (jtbComts == null || jtbComts.isEmpty()) {
             this.jtbComtCache = new ArrayList<>();
             onComplete.run();
             return;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/VenditaFiltroOrdiniViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
similarity index 99%
rename from app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/VenditaFiltroOrdiniViewModel.java
rename to app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
index 25576357..5589489b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/VenditaFiltroOrdiniViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
@@ -21,7 +21,7 @@ import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoDTO;
 
-public class VenditaFiltroOrdiniViewModel {
+public class OrdiniUscitaElencoFiltroViewModel {
 
     private final ObservableField<Predicate<OrdiniUscitaElencoDTO>> currentDepositoPredicate = new ObservableField<>();
     private final ObservableField<Predicate<OrdiniUscitaElencoDTO>> currentIdViaggioPredicate = new ObservableField<>();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoBindings.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoBindings.java
index ecc01702..d778177f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoBindings.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoBindings.java
@@ -3,7 +3,7 @@ package it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione;
 import java.util.HashMap;
 
 import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
-import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.FilterCommessaLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterCommessaLayoutView;
 import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
 
 public class ProdOrdineProduzioneElencoBindings {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java
index fed528ba..5d2f2a0a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java
@@ -43,7 +43,7 @@ import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.OrdineAcc
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.SitArtOrdDTO;
 import it.integry.integrywmsnative.gest.accettazione_ordini_picking.AccettazioneOrdiniPickingActivity;
 import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
-import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.FilterCommessaLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterCommessaLayoutView;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.OrdineProduzioneFilterViewModel;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ui.MainListProdOrdineProduzioneElencoClienteListModel;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ui.MainListProdOrdineProduzioneElencoListModel;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdBindings.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdBindings.java
index d7c70c43..eb2f2603 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdBindings.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdBindings.java
@@ -3,7 +3,6 @@ package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod;
 import java.util.HashMap;
 
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterGruppoMercLayoutView;
-import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.FilterCommessaLayoutView;
 import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
 import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java
index 417e1364..224dc1f9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java
@@ -10,8 +10,6 @@ import androidx.appcompat.widget.AppCompatTextView;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
 
 import com.annimon.stream.Stream;
 import com.ravikoradiya.liveadapter.LiveAdapter;
@@ -19,12 +17,11 @@ import com.ravikoradiya.liveadapter.Type;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -41,19 +38,14 @@ import it.integry.integrywmsnative.core.model.MtbGrup;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.CommessaRESTConsumer;
-import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.FragmentProdFabbisognoLineeListSingleItemBinding;
 import it.integry.integrywmsnative.databinding.FragmentProdFabbisognoLineeProdBinding;
 import it.integry.integrywmsnative.databinding.FragmentProdFabbisognoLineeTitleItemBinding;
-import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.OrdineAccettazioneInevasoDTO;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterGruppoMercLayoutView;
-import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ui.MainListProdOrdineProduzioneElencoClienteListModel;
-import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ui.MainListProdOrdineProduzioneElencoListModel;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.GroupTitleModel;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeItemModelDto;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
@@ -386,10 +378,10 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
     public void dispatchOrders() {
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
-        String ordini = UtilityDB.listValueToString(Stream.of(mProdFabbisognoItemModel)
+        String ordini = UtilityDB.listValueToString(mProdFabbisognoItemModel.stream()
                 .filter(x -> x instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) x).selected.get())
-                .map(x -> ((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getNumOrd().toString())
-                .toList());
+                .map(x -> String.valueOf(((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getNumOrd()))
+                .collect(Collectors.toList()));
 
         LocalDate dataInizio = Stream.of(mProdFabbisognoItemModel)
                 .filter(x -> x instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) x).selected.get())
@@ -417,10 +409,10 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
     private void startPickingActivity(List<MtbGrup> listMtbGrup, List<ProdFabbisognoLineeProdDTO> fabbisognoList) {
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
-        String ordini = UtilityDB.listValueToString(Stream.of(mProdFabbisognoItemModel)
+        String ordini = UtilityDB.listValueToString(mProdFabbisognoItemModel.stream()
                 .filter(x -> x instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) x).selected.get())
-                .map(x -> ((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getNumOrd().toString())
-                .toList());
+                .map(x -> String.valueOf(((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getNumOrd()))
+                .collect(Collectors.toList()));
 
         Stream<ProdFabbisognoLineeProdDTO> streamSitArtOrd = Stream.of(fabbisognoList);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/filters/ProdFabbisognoLineeProdFilterViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/filters/ProdFabbisognoLineeProdFilterViewModel.java
index 297578a4..5c88e6dd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/filters/ProdFabbisognoLineeProdFilterViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/filters/ProdFabbisognoLineeProdFilterViewModel.java
@@ -9,10 +9,9 @@ import com.annimon.stream.function.Predicate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import it.integry.integrywmsnative.core.model.MtbGrup;
-import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
-import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoDTO;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeItemModelDto;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 
@@ -78,13 +77,11 @@ public class ProdFabbisognoLineeProdFilterViewModel {
     }
 
     public List<Integer> getAllNumOrds() {
-        return Stream
-                .of(Objects.requireNonNull(initialList))
-                .filter(x -> x.getOrdineLavorazioneDTO().getNumOrd() != null)
-                .sortBy(x -> -x.getOrdineLavorazioneDTO().getNumOrd())
-                .map(x -> x.getOrdineLavorazioneDTO().getNumOrd() != null ? x.getOrdineLavorazioneDTO().getNumOrd() : null)
+        return Objects.requireNonNull(initialList).stream()
+                .map(x -> x.getOrdineLavorazioneDTO().getNumOrd())
+                .sorted()
                 .distinct()
-                .toList();
+                .collect(Collectors.toList());
     }
 
     public List<Integer> getAvailableNumOrds() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java
index 12d30271..372fff5a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java
@@ -10,11 +10,11 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
-import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableField;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import javax.inject.Inject;
 
@@ -120,13 +120,12 @@ public class ProdRientroMerceFragment extends BaseFragment implements
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
-        mBindings = DataBindingUtil.inflate(LayoutInflater.from(getActivity()), R.layout.fragment_prod_rientro_merce, container, false);
+        mBindings = FragmentProdRientroMerceBinding.inflate(LayoutInflater.from(getActivity()), container, false);
         mBindings.setLifecycleOwner(this);
         mBindings.setView(this);
         mBindings.setViewmodel(mViewModel);
 
         mViewModel.setListener(this);
-        
 
         return mBindings.getRoot();
     }
@@ -149,6 +148,7 @@ public class ProdRientroMerceFragment extends BaseFragment implements
 
     }
 
+
     @Override
     public void addOnPreDestroy(Runnable onPreDestroy) {
         this.mOnPreDestroyList.add(onPreDestroy);
@@ -172,6 +172,20 @@ public class ProdRientroMerceFragment extends BaseFragment implements
 
     private void ordersUpdated(List<OrdineLavorazioneDTO> ordiniLavorazioneList) {
         this.mProdRientroMerceOrderListFragment.pushOrderList(ordiniLavorazioneList);
+
+        if (mProdRientroMerceOrderDetailFragment != null && mProdRientroMerceOrderDetailFragment.getCurrentOrder().getValue() != null) {
+            var orderToRefresh = mProdRientroMerceOrderDetailFragment.getCurrentOrder().getValue();
+
+            Optional<OrdineLavorazioneDTO> foundOrder = ordiniLavorazioneList.stream().filter(x -> x.getNumOrd() == orderToRefresh.getNumOrd() &&
+                            x.getDataOrd().equals(orderToRefresh.getDataOrd()) &&
+                            x.getGestione().equalsIgnoreCase(orderToRefresh.getGestione()))
+                    .findFirst();
+
+            if(foundOrder.isPresent())
+                mProdRientroMerceOrderDetailFragment.setOrder(foundOrder.get());
+            else
+                mProdRientroMerceOrderDetailFragment.setOrder(null);
+        }
     }
 
     @Override
@@ -220,4 +234,6 @@ public class ProdRientroMerceFragment extends BaseFragment implements
 
         else onComplete.run();
     }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java
index 4e00882f..33c0baf2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java
@@ -27,6 +27,10 @@ public class ProdRientroMerceViewModel {
         this.mMesRESTConsumer = mesRESTConsumer;
     }
 
+
+
+
+
     public void refreshOrderList() {
         this.sendOnOrdersLoadingStarted();
         String codAnag = SettingsManager.iDB().getFilterFornitoreProd();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
index c990983b..08337977 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
@@ -174,6 +174,10 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
 
     }
 
+    public MutableLiveData<OrdineLavorazioneDTO> getCurrentOrder() {
+        return currentOrder;
+    }
+
     private void onConnected(BluetoothSerialDevice connectedDevice) {
         Toast.makeText(requireActivity(), "Connesso a: " + connectedDevice.getMac(), Toast.LENGTH_LONG).show();
         mConnectedBluetoothDevice = connectedDevice;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
index 96837a25..f5335f1f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
@@ -74,16 +74,18 @@ public class ProdRientroMerceOrderDetailViewModel {
         //this.sendOnLoadingStarted();
         this.mtbColtsOfOrder.postValue(null);
 
-        this.prodRientroMerceOrderDetailRESTConsumer.getMtbColtsOfOrder(currentOrder, mtbColts -> {
-            for (MtbColt mtbColt : mtbColts) {
-                mtbColt.getMtbColr().get(0)
-                        .setDescrizione(currentOrder.getDescrizioneProd())
-                        .setUntMis(currentOrder.getUntOrd());
-            }
+        if (currentOrder != null) {
+            this.prodRientroMerceOrderDetailRESTConsumer.getMtbColtsOfOrder(currentOrder, mtbColts -> {
+                for (MtbColt mtbColt : mtbColts) {
+                    mtbColt.getMtbColr().get(0)
+                            .setDescrizione(currentOrder.getDescrizioneProd())
+                            .setUntMis(currentOrder.getUntOrd());
+                }
 
-            this.mtbColtsOfOrder.postValue(mtbColts);
-            //this.sendOnLoadingEnded();
-        }, this::sendError);
+                this.mtbColtsOfOrder.postValue(mtbColts);
+                //this.sendOnLoadingEnded();
+            }, this::sendError);
+        }
     }
 
     public void retrieveOrderData(RunnableArgss<MtbAart, String> onComplete) {
@@ -139,7 +141,7 @@ public class ProdRientroMerceOrderDetailViewModel {
 
         this.prodRientroMerceOrderDetailRESTConsumer.importColliDaProduzione(importColliDaProduzioneRequestDTO, mtbColtSaved -> {
 
-            if(SettingsManager.iDB().isProduzioneGeneraDocCar() || SettingsManager.iDB().isProduzioneGeneraDocScar()) {
+            if (SettingsManager.iDB().isProduzioneGeneraDocCar() || SettingsManager.iDB().isProduzioneGeneraDocScar()) {
 
                 CaricoProdFinDTO caricoProdFinDTO = new CaricoProdFinDTO()
                         .setEscludiArticoliGestitiDaWmsInScarico(true)
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListComponent.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListComponent.java
new file mode 100644
index 00000000..51d5eb39
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListComponent.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_list;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface ProdRientroMerceOrderListComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        ProdRientroMerceOrderListComponent create();
+    }
+
+    void inject(ProdRientroMerceOrderListFragment prodRientroMerceOrderListFragment);
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterBindings.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterBindings.java
new file mode 100644
index 00000000..c24a5b1a
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterBindings.java
@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_list;
+
+import java.util.HashMap;
+
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterCommessaLayoutView;
+
+public class ProdRientroMerceOrderListFilterBindings {
+    public static final int COMMESSA_FILTER_ID = 0;
+
+
+    public static final HashMap<Integer, FilterChipDTO> AVAILABLE_FILTERS = new HashMap<>() {{
+        put(COMMESSA_FILTER_ID, new FilterChipDTO()
+                .setID(COMMESSA_FILTER_ID)
+                .setPosizione(9)
+                .setFilterChipText("Commessa")
+                .setFilterLayoutView(new FilterCommessaLayoutView()));
+    }};
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterViewModel.java
new file mode 100644
index 00000000..86e14377
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterViewModel.java
@@ -0,0 +1,113 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_list;
+
+import androidx.databinding.ObservableField;
+import androidx.lifecycle.MutableLiveData;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import it.integry.integrywmsnative.core.model.JtbComt;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
+
+public class ProdRientroMerceOrderListFilterViewModel {
+
+    private final ObservableField<Predicate<OrdineLavorazioneDTO>> currentCommessaPredicate = new ObservableField<>();
+
+    private List<OrdineLavorazioneDTO> initialOrderList;
+    private final MutableLiveData<List<OrdineLavorazioneDTO>> currentFilteredOrderList = new MutableLiveData<>();
+
+    public void init(List<OrdineLavorazioneDTO> initialList) {
+        this.initialOrderList = initialList;
+        this.currentFilteredOrderList.setValue(this.initialOrderList);
+    }
+
+    public MutableLiveData<List<OrdineLavorazioneDTO>> getMutableFilteredOrderList() {
+        return this.currentFilteredOrderList;
+    }
+
+    public void setCommessaFilter(List<JtbComt> jtbComtList) {
+        if (jtbComtList == null || jtbComtList.isEmpty()) currentCommessaPredicate.set(null);
+        else {
+            List<String> codJcoms = jtbComtList.stream()
+                    .map(JtbComt::getCodJcom)
+                    .collect(Collectors.toList());
+            currentCommessaPredicate.set(o -> codJcoms.contains(o.getCodJcom()));
+        }
+    }
+
+
+    public void applyAllTests() {
+
+        List<OrdineLavorazioneDTO> returnList = null;
+
+        if (
+                currentCommessaPredicate.get() == null
+        ) {
+            returnList = this.initialOrderList;
+        } else {
+            Stream<OrdineLavorazioneDTO> tmpStream = this.initialOrderList.stream()
+                    .filter(x ->
+                            (currentCommessaPredicate.get() == null || (currentCommessaPredicate.get().test(x)))
+                    );
+
+            returnList = tmpStream.collect(Collectors.toList());
+        }
+
+        this.currentFilteredOrderList.setValue(returnList);
+    }
+
+    public ObservableField<Predicate<OrdineLavorazioneDTO>> getCurrentCommessaPredicate() {
+        return currentCommessaPredicate;
+    }
+
+
+
+
+
+    public List<JtbComt> getAllCommesse(List<JtbComt> commesseFullList) {
+        List<String> codJcom = initialOrderList.stream()
+                .map(OrdineLavorazioneDTO::getCodJcom)
+                .distinct()
+                .collect(Collectors.toUnmodifiableList());
+
+        return Objects.requireNonNull(commesseFullList).stream()
+                .filter(x -> x != null && codJcom.contains(x.getCodJcom()))
+                .distinct()
+                .sorted((o1, o2) -> o1.getCodJcom().compareTo(o2.getCodJfas()))
+                .collect(Collectors.toUnmodifiableList());
+    }
+
+    public List<JtbComt> getAvailableCommesse(List<JtbComt> commesseFullList) {
+
+//        if (currentIdViaggioPredicate.get() == null ) {
+            return getAllCommesse(commesseFullList);
+//        } else {
+//            List<String> availableCommesse = Stream.of(this.initialOrderList)
+//                    .filter(x ->
+//                            (currentIdViaggioPredicate.get() == null || (currentIdViaggioPredicate.get().test(x))) &&
+//                                    (currentNumOrdsPredicate.get() == null || (currentNumOrdsPredicate.get().test(x))) &&
+//                                    (currentDataConsPredicate.get() == null || (currentDataConsPredicate.get().test(x))) &&
+//                                    (currentAgentePredicate.get() == null || (currentAgentePredicate.get().test(x))) &&
+//                                    (currentClientePredicate.get() == null || (currentClientePredicate.get().test(x))) &&
+//                                    (currentVettorePredicate.get() == null || (currentVettorePredicate.get().test(x))) &&
+//                                    (currentDepositoPredicate.get() == null || (currentDepositoPredicate.get().test(x))) &&
+//                                    (currentPaesePredicate.get() == null || (currentPaesePredicate.get().test(x))) &&
+//                                    (currentAutomezzoPredicate.get() == null || (currentAutomezzoPredicate.get().test(x))) &&
+//                                    (currentGruppoMercPredicate.get() == null || (currentGruppoMercPredicate.get().test(x))) &&
+//                                    (currentTermConsPredicate.get() == null || (currentTermConsPredicate.get().test(x)))
+//                    )
+//                    .map(OrdineUscitaInevasoDTO::getCodJcom)
+//                    .distinct()
+//                    .toList();
+//
+//            return Stream.of(Objects.requireNonNull(commesseFullList))
+//                    .filter(x -> availableCommesse.contains(x.getCodJcom()))
+//                    .distinct()
+//                    .withoutNulls()
+//                    .sortBy(JtbComt::getCodJcom)
+//                    .toList();
+        }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java
index 0fffb242..3a956920 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java
@@ -6,7 +6,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.core.content.ContextCompat;
-import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -18,17 +17,32 @@ import com.annimon.stream.Stream;
 import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.data_cache.DataCache;
+import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.JtbComt;
+import it.integry.integrywmsnative.core.rest.consumers.CommessaRESTConsumer;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.FragmentProdRientroMerceOrderListBinding;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
 import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipView;
+import it.integry.integrywmsnative.ui.filter_chips.filters.FilterCommessaLayoutView;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -37,14 +51,27 @@ import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
  */
 public class ProdRientroMerceOrderListFragment extends Fragment {
 
+    @Inject
+    CommessaRESTConsumer mCommessaRESTConsumer;
+
     private final ObservableArrayList<ProdRientroMerceOrderListModel> mOrdiniApertiMutableData = new ObservableArrayList<>();
     private FragmentProdRientroMerceOrderListBinding mBindings = null;
     private RunnableArgs<OrdineLavorazioneDTO> mOnItemSelectedRunnable;
+
     private ElevatedToolbar mToolbar;
     private OnRefreshListener onRefreshListener;
 
+    private final ProdRientroMerceOrderListFilterViewModel mAppliedFilterViewModel = new ProdRientroMerceOrderListFilterViewModel();
+    private List<OrdineLavorazioneDTO> internalOrderList = new ArrayList<>();
+
+    private List<JtbComt> jtbComtCache;
+
     public ProdRientroMerceOrderListFragment() {
         // Required empty public constructor
+        MainApplication.appComponent
+                .prodRientroMerceOrderListComponent()
+                .create()
+                .inject(this);
     }
 
     public static ProdRientroMerceOrderListFragment newInstance(ElevatedToolbar elevatedToolbar) {
@@ -56,6 +83,7 @@ public class ProdRientroMerceOrderListFragment extends Fragment {
         return prodRientroMerceOrderListFragment;
     }
 
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -68,21 +96,23 @@ public class ProdRientroMerceOrderListFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_prod_rientro_merce_order_list, container, false);
+        mBindings = FragmentProdRientroMerceOrderListBinding.inflate(inflater, container, false);
 
         mBindings.setLifecycleOwner(this);
 
-        if (savedInstanceState == null) this.initRecyclerView();
+        if (savedInstanceState == null) {
+            this.initRecyclerView();
+            this.initFilters();
+        }
 
         return mBindings.getRoot();
     }
 
     private void initRecyclerView() {
-        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(getActivity(), SimpleDividerItemDecoration.VERTICAL);
-        itemDecorator.setDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.divider));
+        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(requireActivity(), SimpleDividerItemDecoration.VERTICAL);
+        itemDecorator.setDrawable(ContextCompat.getDrawable(requireActivity(), R.drawable.divider));
         this.mBindings.mainList.addItemDecoration(itemDecorator);
 
-
         ProdRientroMerceOrderListAdapter prodRientroMerceOrderListAdapter = new ProdRientroMerceOrderListAdapter(getActivity(), mOrdiniApertiMutableData)
                 .setEmptyView(this.mBindings.emptyView)
                 .setOnItemClicked(x -> {
@@ -100,10 +130,139 @@ public class ProdRientroMerceOrderListFragment extends Fragment {
         });
     }
 
-    public void pushOrderList(List<OrdineLavorazioneDTO> orderList) {
-        this.mOrdiniApertiMutableData.clear();
-        this.mOrdiniApertiMutableData.addAll(convertDataModelToListModel(orderList));
+    private void initFilters() {
+        var onPredicateChanged = new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                refreshList();
+            }
+        };
 
+        mAppliedFilterViewModel.getCurrentCommessaPredicate().addOnPropertyChangedCallback(onPredicateChanged);
+
+        List<FilterChipDTO> filterList = ProdRientroMerceOrderListFilterBindings.AVAILABLE_FILTERS.entrySet().stream()
+                .map(Map.Entry::getValue)
+                .sorted(Comparator.comparing(FilterChipDTO::getPosizione))
+                .collect(Collectors.toList());
+
+        for (FilterChipDTO filterChipDTO : filterList) {
+
+            FilterChipView filterChipView = new FilterChipView(
+                    requireActivity(),
+                    filterChipDTO.getFilterChipText(),
+                    v -> initBottomSheetDialogFilter(filterChipDTO));
+
+            switch (filterChipDTO.getID()) {
+
+                case ProdRientroMerceOrderListFilterBindings.COMMESSA_FILTER_ID -> {
+                    mAppliedFilterViewModel.getCurrentCommessaPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+                        @Override
+                        public void run() {
+                            if (mAppliedFilterViewModel.getCurrentCommessaPredicate().get() == null) {
+                                filterChipView.disableCloseIcon();
+
+                                mBindings.filterChipsGroup.removeView(filterChipView);
+                                mBindings.filterChipsGroup.addView(filterChipView);
+                                mBindings.filterChips.smoothScrollTo(0, 0);
+                            } else {
+                                filterChipView.enableCloseIcon();
+
+                                mBindings.filterChipsGroup.removeView(filterChipView);
+                                mBindings.filterChipsGroup.addView(filterChipView, 0);
+                                mBindings.filterChips.smoothScrollTo(0, 0);
+                            }
+                        }
+                    });
+                    filterChipView.setOnResetClicked(() -> {
+                        mAppliedFilterViewModel.setCommessaFilter(null);
+                        mAppliedFilterViewModel.getCurrentCommessaPredicate().set(null);
+                    });
+                }
+            }
+
+
+            this.mBindings.filterChipsGroup.addView(filterChipView);
+        }
+    }
+
+
+    private void initBottomSheetDialogFilter(FilterChipDTO filterChipDTO) {
+        filterChipDTO
+                .getFilterLayoutView()
+                .setFilterName(filterChipDTO.getFilterChipText())
+                .setContext(requireActivity());
+
+        var filterLayoutView = filterChipDTO
+                .getFilterLayoutView();
+
+        switch (filterChipDTO.getID()) {
+            case ProdRientroMerceOrderListFilterBindings.COMMESSA_FILTER_ID ->
+                    ((FilterCommessaLayoutView) filterLayoutView)
+                            .setAllCommesse(mAppliedFilterViewModel.getAllCommesse(this.jtbComtCache))
+                            .setAvailableCommesse(mAppliedFilterViewModel.getAvailableCommesse(this.jtbComtCache))
+                            .setOnFilterApplied(mAppliedFilterViewModel::setCommessaFilter)
+                            .setPreSelectedCommesse(internalOrderList.stream()
+                                    .filter(mAppliedFilterViewModel.getCurrentCommessaPredicate().get() == null ?
+                                            x -> false :
+                                            Objects.requireNonNull(mAppliedFilterViewModel.getCurrentCommessaPredicate().get()))
+                                    .map(x -> jtbComtCache.parallelStream()
+                                            .filter(y -> x.getCodJcom().equalsIgnoreCase(y.getCodJcom())).findFirst().get())
+                                    .collect(Collectors.toList()));
+        }
+
+        if (!filterLayoutView.isAdded())
+            filterLayoutView.show(requireActivity().getSupportFragmentManager(), "bottom-sheet-filters");
+
+    }
+
+
+    private void initJtbComtCache(Runnable onComplete) {
+        if (this.internalOrderList == null || this.internalOrderList.isEmpty()) {
+            this.jtbComtCache = new ArrayList<>();
+            onComplete.run();
+            return;
+        }
+
+        List<String> jtbComts = this.internalOrderList.stream()
+                .map(OrdineLavorazioneDTO::getCodJcom)
+                .distinct()
+                .filter(Objects::nonNull)
+                .collect(Collectors.toUnmodifiableList());
+
+        if (jtbComts.isEmpty()) {
+            this.jtbComtCache = new ArrayList<>();
+            onComplete.run();
+            return;
+        }
+
+        this.mCommessaRESTConsumer.getJtbComts(jtbComts, jtbComtCache -> {
+            this.jtbComtCache = jtbComtCache;
+            onComplete.run();
+        }, this::onError);
+    }
+
+    public void pushOrderList(List<OrdineLavorazioneDTO> orderList) {
+        this.internalOrderList = orderList;
+
+        onOrderLoadingStarted();
+        this.initJtbComtCache(() -> {
+            mAppliedFilterViewModel.init(internalOrderList);
+            refreshList();
+            onOrderLoadingEnded();
+        });
+
+    }
+
+    private void refreshList() {
+        requireActivity().runOnUiThread(() -> {
+            List<OrdineLavorazioneDTO> tmpList;
+
+            mAppliedFilterViewModel.applyAllTests();
+            tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
+
+            this.mOrdiniApertiMutableData.clear();
+            this.mOrdiniApertiMutableData.addAll(convertDataModelToListModel(tmpList));
+        });
     }
 
     public void onOrderLoadingStarted() {
@@ -115,6 +274,14 @@ public class ProdRientroMerceOrderListFragment extends Fragment {
     }
 
 
+    public void onError(Exception ex) {
+        requireActivity().runOnUiThread(() -> {
+            onOrderLoadingEnded();
+            UtilityExceptions.defaultException(getActivity(), ex);
+            BarcodeManager.enable();
+        });
+    }
+
     private List<ProdRientroMerceOrderListModel> convertDataModelToListModel(List<OrdineLavorazioneDTO> dataList) {
 
         ComparatorCompat<OrdineLavorazioneDTO> comparator = ComparatorCompat
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
index d561e910..c9da016c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
@@ -43,7 +43,7 @@ public class OrdineLavorazioneDTO {
 
     private String gestione;
 
-    private Integer numOrd;
+    private int numOrd;
 
     private String descrizioneProd;
 
@@ -166,11 +166,11 @@ public class OrdineLavorazioneDTO {
         this.gestione = gestione;
     }
 
-    public Integer getNumOrd() {
+    public int getNumOrd() {
         return numOrd;
     }
 
-    public void setNumOrd(Integer numOrd) {
+    public void setNumOrd(int numOrd) {
         this.numOrd = numOrd;
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/filter_chips/FilterLayoutView.java b/app/src/main/java/it/integry/integrywmsnative/ui/filter_chips/FilterLayoutView.java
index 132d0694..8131dea1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/ui/filter_chips/FilterLayoutView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/filter_chips/FilterLayoutView.java
@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SearchView;
 
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
 import it.integry.integrywmsnative.core.di.BindableBoolean;
@@ -24,14 +25,26 @@ public abstract class FilterLayoutView extends BottomSheetDialogFragment {
     private SearchView mSearchView;
     private RunnableArgs<String> mOnFilterChanged;
 
+    @Override
+    public void onStart() {
+        super.onStart();
+    }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        var behavior = BottomSheetBehavior.from((View) view.getParent());
+        behavior.setSkipCollapsed(true);
+
+        getDialog().setOnShowListener(dialogInterface -> {
+            behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+        });
+
         if (mSearchView != null) this.initSearchView();
     }
 
+
     protected void initSearchView() {
 
         mSearchView.setOnSearchClickListener(v -> {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/filters/FilterCommessaLayoutView.java b/app/src/main/java/it/integry/integrywmsnative/ui/filter_chips/filters/FilterCommessaLayoutView.java
similarity index 91%
rename from app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/filters/FilterCommessaLayoutView.java
rename to app/src/main/java/it/integry/integrywmsnative/ui/filter_chips/filters/FilterCommessaLayoutView.java
index 5631ac47..88c095bc 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/filters/FilterCommessaLayoutView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/filter_chips/filters/FilterCommessaLayoutView.java
@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters;
+package it.integry.integrywmsnative.ui.filter_chips.filters;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -7,17 +7,16 @@ import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
 import androidx.lifecycle.MutableLiveData;
 
 import com.annimon.stream.ComparatorCompat;
-import com.annimon.stream.Stream;
 import com.ravikoradiya.liveadapter.LiveAdapter;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import it.integry.integrywmsnative.BR;
 import it.integry.integrywmsnative.R;
@@ -43,16 +42,16 @@ public class FilterCommessaLayoutView extends FilterLayoutView {
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        mBindings = DataBindingUtil.inflate(inflater, R.layout.layout_filter_commessa, container, false);
+        mBindings = LayoutFilterCommessaBinding.inflate(inflater, container, false);
         this.mBindings.setView(this);
 
         refreshList();
 
         this.setSearchView(this.mBindings.searchView, newFilter -> {
-            hiddenCommesse = Stream.of(allCommesse)
+            hiddenCommesse = allCommesse.stream()
                     .filter(x -> !x.getCodJcom().toUpperCase(Locale.ROOT).contains(newFilter.toUpperCase(Locale.ROOT)) &&
                             !x.getDescrizione().toUpperCase(Locale.ROOT).contains(newFilter.toUpperCase(Locale.ROOT)))
-                    .toList();
+                    .collect(Collectors.toList());
 
             refreshList();
         });
@@ -73,7 +72,7 @@ public class FilterCommessaLayoutView extends FilterLayoutView {
                         .thenComparing(new ComparatorCompat<>((x, y) -> y.getOriginalModel().getCodJcom().compareTo(x.getOriginalModel().getCodJcom())))
                         .reversed();
 
-        listModel.setValue(Stream.of(getAllCommesse())
+        listModel.setValue(getAllCommesse().stream()
                 .filter(x -> !hiddenCommesse.contains(x))
                 .map(x -> {
                     var selectedBoolean = new BindableBoolean(preSelectedCommesse.contains(x));
@@ -88,17 +87,17 @@ public class FilterCommessaLayoutView extends FilterLayoutView {
                             .setOriginalModel(x);
                 })
                 .sorted(c)
-                .toList());
+                .collect(Collectors.toList()));
     }
 
 
     public void onConfirm() {
         if (onFilterApplied == null) return;
 
-        this.onFilterApplied.run(Stream.of(Objects.requireNonNull(listModel.getValue()))
+        this.onFilterApplied.run(Objects.requireNonNull(listModel.getValue()).stream()
                 .filter(x -> x.selected.get())
                 .map(x -> x.originalModel)
-                .toList());
+                .collect(Collectors.toList()));
 
         dismiss();
     }
diff --git a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
index 2b88eeaf..34084d5d 100644
--- a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
@@ -137,7 +137,7 @@
                                     style="@style/TextViewMaterial.Dialog.HeadlineText"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:text="@{`Ordine #`+ view.currentOrder.numOrd.toString()}"
+                                    android:text="@{`Ordine #`+ view.currentOrder.numOrd}"
                                     android:textStyle="bold"
                                     tools:text="Ordine #218" />
 
diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita.xml b/app/src/main/res/layout/fragment_main_ordini_uscita.xml
index 3accde27..7c86adde 100644
--- a/app/src/main/res/layout/fragment_main_ordini_uscita.xml
+++ b/app/src/main/res/layout/fragment_main_ordini_uscita.xml
@@ -78,7 +78,7 @@
                     android:orientation="vertical"
                     app:layout_constraintGuide_percent="0.85" />
 
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
@@ -100,7 +100,7 @@
                         android:text="@string/no_orders_found_message"
                         android:textColor="@android:color/black"
                         android:textSize="18sp" />
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
index 8c36d9b7..dfebdd42 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
@@ -131,7 +131,7 @@
                                 style="@style/TextViewMaterial.Dialog.HeadlineText"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:text="@{`Ordine #`+ view.currentOrder.numOrd.toString()}"
+                                android:text="@{`Ordine #`+ view.currentOrder.numOrd}"
                                 android:textStyle="bold"
                                 tools:text="Ordine #218" />
 
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list.xml
index 743ee057..38235587 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list.xml
@@ -18,13 +18,34 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/filter_chips">
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/main_list"
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scrollbars="vertical"
-                tools:listitem="@layout/fragment_prod_rientro_merce_order_list__list_group_model" />
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
+                <HorizontalScrollView
+                    android:id="@+id/filter_chips"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none">
+
+                    <com.google.android.material.chip.ChipGroup
+                        android:id="@+id/filter_chips_group"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="8dp"
+                        android:paddingEnd="8dp"
+                        app:chipSpacing="8dp"
+                        app:singleSelection="true" />
+                </HorizontalScrollView>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/main_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scrollbars="vertical"
+                    tools:listitem="@layout/fragment_prod_rientro_merce_order_list__list_group_model" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -54,7 +75,7 @@
                 android:orientation="vertical"
                 app:layout_constraintGuide_percent="0.85" />
 
-            <LinearLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
@@ -76,7 +97,7 @@
                     android:text="@string/no_orders_found_message"
                     android:textColor="@android:color/black"
                     android:textSize="18sp" />
-            </LinearLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/layout_filter_commessa.xml b/app/src/main/res/layout/layout_filter_commessa.xml
index 1557e4a8..853037fb 100644
--- a/app/src/main/res/layout/layout_filter_commessa.xml
+++ b/app/src/main/res/layout/layout_filter_commessa.xml
@@ -11,13 +11,13 @@
 
         <variable
             name="view"
-            type="it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.FilterCommessaLayoutView" />
+            type="it.integry.integrywmsnative.ui.filter_chips.filters.FilterCommessaLayoutView" />
     </data>
 
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/layout_filter_commessa__list_item.xml b/app/src/main/res/layout/layout_filter_commessa__list_item.xml
index a82bc689..a1773041 100644
--- a/app/src/main/res/layout/layout_filter_commessa__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_commessa__list_item.xml
@@ -10,7 +10,7 @@
 
         <variable
             name="item"
-            type="it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.FilterCommessaLayoutView.ListModel" />
+            type="it.integry.integrywmsnative.ui.filter_chips.filters.FilterCommessaLayoutView.ListModel" />
     </data>
 
     <androidx.appcompat.widget.LinearLayoutCompat

From d4a7dee1218c43050a4cb8b827ffc8f70ff6ac3b Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 4 Feb 2025 09:48:03 +0100
Subject: [PATCH 093/103] Migrata gestione del recupero materiale in un
 servizio dedicato

---
 .idea/deploymentTargetSelector.xml            |   2 +-
 .../MainApplicationModule.java                |   7 +
 .../integrywmsnative/core/model/MtbColr.java  |  15 +-
 .../rest/consumers/MaterialiRESTConsumer.java |  44 ++++
 .../MaterialiRESTConsumerService.java         |  15 ++
 .../rest/consumers/SystemRESTConsumer.java    |   5 +
 .../RecuperaMaterialiRequestDTO.java          | 237 ++++++++++++++++++
 .../RecuperaMaterialiResponseDTO.java         |  12 +
 .../core/update/UpdatesManager.java           |   3 +
 .../ProdRecuperoMaterialeModule.java          |  14 +-
 .../ProdRecuperoMaterialeViewModel.java       | 231 ++++-------------
 .../dto/HistoryVersamentoProdULDTO.java       |  17 +-
 .../dto/HistoryVersamentoProdULRestDTO.java   |  23 +-
 ...=> ProdRecuperoMaterialeRESTConsumer.java} |  59 +++--
 .../dto/OrdineLavorazioneDTO.java             |   6 +-
 15 files changed, 439 insertions(+), 251 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumer.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumerService.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/materiali/RecuperaMaterialiRequestDTO.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/materiali/RecuperaMaterialiResponseDTO.java
 rename app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/{ProdRecuperMaterialeRESTConsumer.java => ProdRecuperoMaterialeRESTConsumer.java} (89%)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index eb6eecea..930fe09a 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-01-17T09:18:08.345092200Z">
+        <DropdownSelection timestamp="2025-01-27T15:42:06.256113400Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=21088B8EFD" />
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
index c4808a1a..515b90b8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
@@ -36,6 +36,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoBufferRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MaterialiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PVOrdiniAcquistoRESTConsumer;
@@ -320,6 +321,12 @@ public class MainApplicationModule {
         return new MagazzinoBufferRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    MaterialiRESTConsumer provideMaterialiRESTConsumer(ExecutorService executorService) {
+        return new MaterialiRESTConsumer(executorService);
+    }
+
     @Provides
     @Singleton
     SoundAlertService provideSoundAlertService() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
index 3d97baa6..69667c4d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
@@ -26,7 +26,7 @@ public class MtbColr extends EntityBase {
     private String gestioneRif;
     private String serColloRif;
     private String note;
-    private String dataOrd;
+    private LocalDate dataOrd;
     private String dataColloRif;
     private BigDecimal qtaCnf;
     private BigDecimal qtaCol;
@@ -225,24 +225,15 @@ public class MtbColr extends EntityBase {
         return this;
     }
 
-    public String getDataOrdS() {
+    public LocalDate getDataOrd() {
         return dataOrd;
     }
 
-    public Date getDataOrdD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS());
-    }
-
-    public MtbColr setDataOrd(String dataOrd) {
+    public MtbColr setDataOrd(LocalDate dataOrd) {
         this.dataOrd = dataOrd;
         return this;
     }
 
-    public MtbColr setDataOrd(Date dataOrd) {
-        this.dataOrd = UtilityDate.formatDate(dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
-        return this;
-    }
-
     public String getDataColloRifS() {
         return dataColloRif;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumer.java
new file mode 100644
index 00000000..31735c9d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumer.java
@@ -0,0 +1,44 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.concurrent.ExecutorService;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.materiali.RecuperaMaterialiRequestDTO;
+
+@Singleton
+public class MaterialiRESTConsumer extends _BaseRESTConsumer {
+
+    private final ExecutorService executorService;
+
+    public MaterialiRESTConsumer(ExecutorService executorService) {
+        this.executorService = executorService;
+    }
+
+    public MtbColt makeSynchronousRecuperaRequest(RecuperaMaterialiRequestDTO request) throws Exception {
+        var materialiRESTConsumerService = RESTBuilder.getService(MaterialiRESTConsumerService.class);
+
+        var response = materialiRESTConsumerService.recupera(request)
+                .execute();
+
+
+        var data = analyzeAnswer(response, "recuperaMateriali");
+        if (data == null) return null;
+        return data.getUpdatedMtbColtScarico();
+    }
+
+    public void makeRecuperaRequest(RecuperaMaterialiRequestDTO request, final RunnableArgs<MtbColt> onComplete, final RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = makeSynchronousRecuperaRequest(request);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumerService.java
new file mode 100644
index 00000000..57b6a67e
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumerService.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.materiali.RecuperaMaterialiRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.materiali.RecuperaMaterialiResponseDTO;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.POST;
+
+public interface MaterialiRESTConsumerService {
+
+    @POST("wms/materiali/recupera")
+    Call<ServiceRESTResponse<RecuperaMaterialiResponseDTO>> recupera(@Body RecuperaMaterialiRequestDTO request);
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
index f0f5db5f..885c0a9e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
@@ -43,6 +43,11 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
                 .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<LatestAppVersionInfoDTO> call, Response<LatestAppVersionInfoDTO> response) {
+                        if(response.code() == 404) {
+                            onSuccess.run(null);
+                            return;
+                        }
+
                         analyzeAnswerGeneric(response, "updates", onSuccess, onFailed);
                     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/materiali/RecuperaMaterialiRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/materiali/RecuperaMaterialiRequestDTO.java
new file mode 100644
index 00000000..f40def63
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/materiali/RecuperaMaterialiRequestDTO.java
@@ -0,0 +1,237 @@
+package it.integry.integrywmsnative.core.rest.model.materiali;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class RecuperaMaterialiRequestDTO {
+
+    private String codMart;
+    private String partitaMag;
+    private BigDecimal numCnf;
+    private BigDecimal qtaCnf;
+    private BigDecimal qtaTot;
+
+    private int numCollo;
+    private LocalDate dataCollo;
+    private String gestione;
+    private String serCollo;
+
+    private int numColloRif;
+    private LocalDate dataColloRif;
+    private String gestioneRif;
+    private String serColloRif;
+
+    private List<Ordine> ordini;
+    private MtbColt mtbColtCarico;
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public RecuperaMaterialiRequestDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public RecuperaMaterialiRequestDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public BigDecimal getNumCnf() {
+        return numCnf;
+    }
+
+    public RecuperaMaterialiRequestDTO setNumCnf(BigDecimal numCnf) {
+        this.numCnf = numCnf;
+        return this;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public RecuperaMaterialiRequestDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public BigDecimal getQtaTot() {
+        return qtaTot;
+    }
+
+    public RecuperaMaterialiRequestDTO setQtaTot(BigDecimal qtaTot) {
+        this.qtaTot = qtaTot;
+        return this;
+    }
+
+    public int getNumCollo() {
+        return numCollo;
+    }
+
+    public RecuperaMaterialiRequestDTO setNumCollo(int numCollo) {
+        this.numCollo = numCollo;
+        return this;
+    }
+
+    public LocalDate getDataCollo() {
+        return dataCollo;
+    }
+
+    public RecuperaMaterialiRequestDTO setDataCollo(LocalDate dataCollo) {
+        this.dataCollo = dataCollo;
+        return this;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public RecuperaMaterialiRequestDTO setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
+
+    public String getSerCollo() {
+        return serCollo;
+    }
+
+    public RecuperaMaterialiRequestDTO setSerCollo(String serCollo) {
+        this.serCollo = serCollo;
+        return this;
+    }
+
+    public int getNumColloRif() {
+        return numColloRif;
+    }
+
+    public RecuperaMaterialiRequestDTO setNumColloRif(int numColloRif) {
+        this.numColloRif = numColloRif;
+        return this;
+    }
+
+    public LocalDate getDataColloRif() {
+        return dataColloRif;
+    }
+
+    public RecuperaMaterialiRequestDTO setDataColloRif(LocalDate dataColloRif) {
+        this.dataColloRif = dataColloRif;
+        return this;
+    }
+
+    public String getGestioneRif() {
+        return gestioneRif;
+    }
+
+    public RecuperaMaterialiRequestDTO setGestioneRif(String gestioneRif) {
+        this.gestioneRif = gestioneRif;
+        return this;
+    }
+
+    public String getSerColloRif() {
+        return serColloRif;
+    }
+
+    public RecuperaMaterialiRequestDTO setSerColloRif(String serColloRif) {
+        this.serColloRif = serColloRif;
+        return this;
+    }
+
+    public List<Ordine> getOrdini() {
+        return ordini;
+    }
+
+    public RecuperaMaterialiRequestDTO setOrdini(List<Ordine> ordini) {
+        this.ordini = ordini;
+        return this;
+    }
+
+    public MtbColt getMtbColtCarico() {
+        return mtbColtCarico;
+    }
+
+    public RecuperaMaterialiRequestDTO setMtbColtCarico(MtbColt mtbColtCarico) {
+        this.mtbColtCarico = mtbColtCarico;
+        return this;
+    }
+
+    public static class Ordine {
+        private Integer numero;
+        private LocalDate data;
+        private String gestione;
+        private Integer rigaOrd;
+        private BigDecimal qtaCol;
+        private BigDecimal numCnf;
+        private Integer percentageHr;
+
+        public Integer getNumero() {
+            return numero;
+        }
+
+        public Ordine setNumero(Integer numero) {
+            this.numero = numero;
+            return this;
+        }
+
+        public LocalDate getData() {
+            return data;
+        }
+
+        public Ordine setData(LocalDate data) {
+            this.data = data;
+            return this;
+        }
+
+        public String getGestione() {
+            return gestione;
+        }
+
+        public Ordine setGestione(String gestione) {
+            this.gestione = gestione;
+            return this;
+        }
+
+        public Integer getRigaOrd() {
+            return rigaOrd;
+        }
+
+        public Ordine setRigaOrd(Integer rigaOrd) {
+            this.rigaOrd = rigaOrd;
+            return this;
+        }
+
+        public BigDecimal getQtaCol() {
+            return qtaCol;
+        }
+
+        public Ordine setQtaCol(BigDecimal qtaCol) {
+            this.qtaCol = qtaCol;
+            return this;
+        }
+
+        public BigDecimal getNumCnf() {
+            return numCnf;
+        }
+
+        public Ordine setNumCnf(BigDecimal numCnf) {
+            this.numCnf = numCnf;
+            return this;
+        }
+
+        public Integer getPercentageHr() {
+            return percentageHr;
+        }
+
+        public Ordine setPercentageHr(Integer percentageHr) {
+            this.percentageHr = percentageHr;
+            return this;
+        }
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/materiali/RecuperaMaterialiResponseDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/materiali/RecuperaMaterialiResponseDTO.java
new file mode 100644
index 00000000..e16e4f1b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/materiali/RecuperaMaterialiResponseDTO.java
@@ -0,0 +1,12 @@
+package it.integry.integrywmsnative.core.rest.model.materiali;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class RecuperaMaterialiResponseDTO {
+
+    private MtbColt updatedMtbColtScarico;
+
+    public MtbColt getUpdatedMtbColtScarico() {
+        return updatedMtbColtScarico;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java
index 3aaee7d8..a8703dbf 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java
@@ -39,6 +39,9 @@ public class UpdatesManager {
 
         systemRESTConsumer.retrieveUpdatesInfo(latestData -> {
 
+            if(latestData == null)
+                return;
+
             AppUpdater appUpdater = new AppUpdater(mContext)
                     .setDisplay(Display.DIALOG)
                     .setUpdateFrom(UpdateFrom.JSON)
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeModule.java
index 217ffe62..83f5cad7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeModule.java
@@ -4,21 +4,25 @@ import dagger.Module;
 import dagger.Provides;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MaterialiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
-import it.integry.integrywmsnative.gest.prod_recupero_materiale.rest.ProdRecuperMaterialeRESTConsumer;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.rest.ProdRecuperoMaterialeRESTConsumer;
 
 @Module(subcomponents = ProdRecuperoMaterialeComponent.class)
 public class ProdRecuperoMaterialeModule {
 
     @Provides
-    ProdRecuperMaterialeRESTConsumer providesProdRecuperMaterialeRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
-        return new ProdRecuperMaterialeRESTConsumer(systemRESTConsumer, articoloRESTConsumer);
+    ProdRecuperoMaterialeRESTConsumer providesProdRecuperMaterialeRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+        return new ProdRecuperoMaterialeRESTConsumer(systemRESTConsumer, articoloRESTConsumer);
     }
 
     @Provides
-    ProdRecuperoMaterialeViewModel providesProdRecuperoMaterialeViewModel(ProdRecuperMaterialeRESTConsumer prodRecuperMaterialeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer) {
-        return new ProdRecuperoMaterialeViewModel(prodRecuperMaterialeRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer);
+    ProdRecuperoMaterialeViewModel providesProdRecuperoMaterialeViewModel(ProdRecuperoMaterialeRESTConsumer prodRecuperoMaterialeRESTConsumer,
+                                                                          ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
+                                                                          PrinterRESTConsumer printerRESTConsumer,
+                                                                          MaterialiRESTConsumer materialiRESTConsumer) {
+        return new ProdRecuperoMaterialeViewModel(prodRecuperoMaterialeRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer, materialiRESTConsumer);
     }
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
index 832d6547..83cc9dbf 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
@@ -1,11 +1,8 @@
 package it.integry.integrywmsnative.gest.prod_recupero_materiale;
 
-import androidx.databinding.ObservableArrayList;
 import androidx.lifecycle.MutableLiveData;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -17,26 +14,24 @@ import it.integry.integrywmsnative.core.exception.NoLUFoundException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
-import it.integry.integrywmsnative.core.model.CommonModelConsts;
 import it.integry.integrywmsnative.core.model.MtbAart;
-import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MaterialiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
-import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.rest.model.materiali.RecuperaMaterialiRequestDTO;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
-import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULDTO;
-import it.integry.integrywmsnative.gest.prod_recupero_materiale.rest.ProdRecuperMaterialeRESTConsumer;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.rest.ProdRecuperoMaterialeRESTConsumer;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 
 public class ProdRecuperoMaterialeViewModel {
 
-    private final ProdRecuperMaterialeRESTConsumer mProdRecuperMaterialeRESTConsumer;
+    private final ProdRecuperoMaterialeRESTConsumer mProdRecuperoMaterialeRESTConsumer;
     private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
     private final PrinterRESTConsumer mPrinterRESTConsumer;
+    private final MaterialiRESTConsumer mMaterialiRESTConsumer;
 
     private final MutableLiveData<List<HistoryVersamentoProdULDTO>> mUlList = new MutableLiveData<>();
 
@@ -44,18 +39,20 @@ public class ProdRecuperoMaterialeViewModel {
 
 
     @Inject
-    public ProdRecuperoMaterialeViewModel(ProdRecuperMaterialeRESTConsumer prodRecuperMaterialeRESTConsumer,
+    public ProdRecuperoMaterialeViewModel(ProdRecuperoMaterialeRESTConsumer prodRecuperoMaterialeRESTConsumer,
                                           ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
-                                          PrinterRESTConsumer printerRESTConsumer) {
-        this.mProdRecuperMaterialeRESTConsumer = prodRecuperMaterialeRESTConsumer;
+                                          PrinterRESTConsumer printerRESTConsumer,
+                                          MaterialiRESTConsumer materialiRESTConsumer) {
+        this.mProdRecuperoMaterialeRESTConsumer = prodRecuperoMaterialeRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
         this.mPrinterRESTConsumer = printerRESTConsumer;
+        this.mMaterialiRESTConsumer = materialiRESTConsumer;
     }
 
     public void init(String codJfas) {
         this.sendOnLoadingStarted();
 
-        mProdRecuperMaterialeRESTConsumer.loadLastULVersate(codJfas, ulList -> {
+        mProdRecuperoMaterialeRESTConsumer.loadLastULVersate(codJfas, ulList -> {
             this.mUlList.setValue(ulList);
 
             this.sendOnLoadingEnded();
@@ -138,184 +135,46 @@ public class ProdRecuperoMaterialeViewModel {
 
         this.sendOnLoadingStarted();
 
-        BigDecimal inputNumCnf = pickedQuantityDTO.getNumCnf();
-        BigDecimal inputQtaTot = pickedQuantityDTO.getQtaTot();
-        BigDecimal inputQtaCnf = pickedQuantityDTO.getQtaCnf();
-
-        final MtbColt mtbColtScarico = new MtbColt()
-                .setDataCollo(item.getDataCollo())
-                .setSerCollo(item.getSerCollo())
-                .setNumCollo(item.getNumCollo())
-                .setGestione(item.getGestione())
-                .setMtbColr(new ObservableArrayList<>());
-
-
-        BigDecimal totalSumOfQtaCol = BigDecimal.ZERO;
-        BigDecimal totalSumOfNumCnf = BigDecimal.ZERO;
-
-        if (SettingsManager.iDB().isFlagVersamentoDirettoProduzione()) {
-            for (HistoryVersamentoProdULDTO.OrdineDto ordine : item.getOrdini()) {
-
-                BigDecimal qtaColToSave;
-                BigDecimal numCnfToSave;
-
-                if (SettingsManager.iDB().isFlagForceAllToColli() || (item.getMtbAart() != null && !item.getMtbAart().isFlagQtaCnfFissaBoolean())) {
-                    numCnfToSave = UtilityBigDecimal.divideAndRoundToInteger(inputNumCnf.multiply(BigDecimal.valueOf(ordine.getPercentageHr())), BigDecimal.valueOf(100), RoundingMode.FLOOR);
-                    qtaColToSave = numCnfToSave.multiply(inputQtaCnf).setScale(0, BigDecimal.ROUND_FLOOR);
-                } else {
-                    qtaColToSave = UtilityBigDecimal.divideAndRoundToInteger(inputQtaTot.multiply(BigDecimal.valueOf(ordine.getPercentageHr())), BigDecimal.valueOf(100), RoundingMode.FLOOR);
-                    numCnfToSave = UtilityBigDecimal.divide(qtaColToSave, item.getQtaCnf(), RoundingMode.FLOOR);
-                }
-
-
-                totalSumOfQtaCol = totalSumOfQtaCol.add(qtaColToSave);
-                totalSumOfNumCnf = totalSumOfNumCnf.add(numCnfToSave);
-
-                numCnfToSave = numCnfToSave.multiply(BigDecimal.valueOf(-1));
-                qtaColToSave = qtaColToSave.multiply(BigDecimal.valueOf(-1));
-
-
-                final MtbColr mtbColrScarico = new MtbColr()
-                        .setCodMart(item.getCodMart())
-                        .setPartitaMag(UtilityString.empty2null(item.getPartitaMag()))
-                        .setQtaCol(qtaColToSave)
-                        .setQtaCnf(inputQtaCnf)
-                        .setNumCnf(numCnfToSave)
-                        .setDescrizione(UtilityString.isNullOrEmpty(item.getMtbAart().getDescrizioneEstesa()) ? item.getMtbAart().getDescrizione() : item.getMtbAart().getDescrizioneEstesa())
-                        .setDatetimeRow(UtilityDate.getDateInstance())
-                        .setNumColloRif(item.getNumColloRif())
-                        .setDataColloRif(item.getDataColloRif())
-                        .setGestioneRif(item.getGestioneRif())
-                        .setSerColloRif(item.getSerColloRif())
-                        .setDataOrd(ordine.getData())
-                        .setNumOrd(ordine.getNumero())
-                        .setRigaOrd(ordine.getRigaOrd());
-
-                mtbColrScarico.setOperation(CommonModelConsts.OPERATION.INSERT);
-                mtbColtScarico.getMtbColr().add(mtbColrScarico);
-            }
-        } else {
-
-
-
-            BigDecimal qtaColToSave;
-            BigDecimal numCnfToSave;
-            if (SettingsManager.iDB().isFlagForceAllToColli() || (item.getMtbAart() != null && !item.getMtbAart().isFlagQtaCnfFissaBoolean())) {
-                numCnfToSave = inputNumCnf;
-                qtaColToSave = numCnfToSave.multiply(inputQtaCnf).setScale(0, BigDecimal.ROUND_FLOOR);
-            } else {
-                qtaColToSave = inputQtaTot;
-                numCnfToSave = UtilityBigDecimal.divide(qtaColToSave, item.getQtaCnf(), RoundingMode.FLOOR);
-            }
-
-            totalSumOfQtaCol = qtaColToSave;
-            totalSumOfNumCnf = numCnfToSave;
-
-            numCnfToSave = numCnfToSave.multiply(BigDecimal.valueOf(-1));
-            qtaColToSave = qtaColToSave.multiply(BigDecimal.valueOf(-1));
-
-            final MtbColr mtbColrScarico = new MtbColr()
-                    .setCodMart(item.getCodMart())
-                    .setPartitaMag(UtilityString.empty2null(item.getPartitaMag()))
-                    .setQtaCol(qtaColToSave)
-                    .setQtaCnf(inputQtaCnf)
-                    .setNumCnf(numCnfToSave)
-                    .setDescrizione(UtilityString.isNullOrEmpty(item.getMtbAart().getDescrizioneEstesa()) ? item.getMtbAart().getDescrizione() : item.getMtbAart().getDescrizioneEstesa())
-                    .setDatetimeRow(UtilityDate.getDateInstance())
-                    .setNumColloRif(item.getNumColloRif())
-                    .setDataColloRif(item.getDataColloRif())
-                    .setGestioneRif(item.getGestioneRif())
-                    .setSerColloRif(item.getSerColloRif());
-
-            mtbColrScarico.setOperation(CommonModelConsts.OPERATION.INSERT);
-            mtbColtScarico.getMtbColr().add(mtbColrScarico);
-        }
-
-        boolean updateQtaCnfFirstRow = false;
-
-        if (UtilityBigDecimal.lowerThan(totalSumOfNumCnf, inputNumCnf)) {
-            BigDecimal diff = inputNumCnf.subtract(totalSumOfNumCnf).multiply(BigDecimal.valueOf(-1));
-            mtbColtScarico.getMtbColr().get(0).setNumCnf(mtbColtScarico.getMtbColr().get(0).getNumCnf().add(diff));
-            updateQtaCnfFirstRow = true;
-        }
-
-        if (UtilityBigDecimal.lowerThan(totalSumOfQtaCol, inputQtaTot)) {
-            BigDecimal diff = inputQtaTot.subtract(totalSumOfQtaCol).multiply(BigDecimal.valueOf(-1));
-            mtbColtScarico.getMtbColr().get(0).setQtaCol(mtbColtScarico.getMtbColr().get(0).getQtaCol().add(diff));
-            updateQtaCnfFirstRow = true;
-        }
-
-        if (updateQtaCnfFirstRow) {
-            mtbColtScarico.getMtbColr().get(0).setQtaCnf(
-                    UtilityBigDecimal.divide(mtbColtScarico.getMtbColr().get(0).getQtaCol(), mtbColtScarico.getMtbColr().get(0).getNumCnf()));
-        }
-
-        for (int i = 0; i < mtbColtScarico.getMtbColr().size(); i++) {
-            if (mtbColtScarico.getMtbColr().get(i).getQtaCol().equals(BigDecimal.ZERO)) {
-                mtbColtScarico.getMtbColr().remove(i);
-                i--;
-            }
-        }
-
-        mtbColtScarico.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
-
-
         RunnableArgss<MtbColt, Boolean> saveRunnable = (mtbColt, createdLU) -> {
 
-            if (mtbColt != null) {
+            List<RecuperaMaterialiRequestDTO.Ordine> ordiniRequest = item.getOrdini().stream()
+                    .map(x -> new RecuperaMaterialiRequestDTO.Ordine()
+                            .setData(x.getData())
+                            .setNumero(x.getNumero())
+                            .setGestione(x.getGestione())
+                            .setRigaOrd(x.getRigaOrd())
+                            .setPercentageHr(x.getPercentageHr())
+                            .setQtaCol(x.getQtaCol())
+                            .setNumCnf(x.getNumCnf()))
+                    .collect(Collectors.toUnmodifiableList());
 
-                List<MtbColt> colliToSave = new ArrayList<>();
-                boolean shouldPrint = false;
-
-                if (!Objects.equals(mtbColt.getNumCollo(), item.getNumColloRif()) ||
-                        !Objects.equals(mtbColt.getSerCollo(), item.getSerColloRif()) ||
-                        !Objects.equals(mtbColt.getDataColloLD(), item.getDataColloRif()) ||
-                        !Objects.equals(mtbColt.getGestione(), item.getGestioneRif())) {
-
-                    final MtbColt mtbColtCarico = mtbColt
-                            .setMtbColr(new ObservableArrayList<>());
-                    mtbColtCarico
-                            .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
-
-                    final MtbColr mtbColrCarico = new MtbColr()
-                            .setCodMart(item.getCodMart())
-                            .setPartitaMag(UtilityString.empty2null(item.getPartitaMag()))
-                            .setQtaCol(inputQtaTot)
-                            .setNumCnf(inputNumCnf)
-                            .setQtaCnf(inputQtaCnf)
-                            .setDescrizione(UtilityString.isNullOrEmpty(item.getMtbAart().getDescrizioneEstesa()) ? item.getMtbAart().getDescrizione() : item.getMtbAart().getDescrizioneEstesa())
-                            .setDatetimeRow(UtilityDate.getDateInstance())
-                            .setNumColloRif(item.getNumColloRif())
-                            .setDataColloRif(item.getDataColloRif())
-                            .setGestioneRif(item.getGestioneRif())
-                            .setSerColloRif(item.getSerColloRif());
-
-
-                    mtbColtCarico.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
-                    mtbColtCarico.getMtbColr().add(mtbColrCarico);
-
-                    colliToSave.add(mtbColtCarico);
-                    shouldPrint = true;
-                }
-
-                colliToSave.add(mtbColtScarico);
-
-                boolean finalShouldPrint = shouldPrint;
-                this.mColliMagazzinoRESTConsumer.saveColli(colliToSave, value -> {
-
-//                    FBToast.successToast(mContext, mContext.getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
-//
-                    if (finalShouldPrint) {
-                        printCollo(value.get(0), this::sendOnDataSaved);
-                    } else {
-                        this.sendOnDataSaved();
-                    }
-
-                }, this::sendError);
+            RecuperaMaterialiRequestDTO request = new RecuperaMaterialiRequestDTO()
+                    .setCodMart(item.getCodMart())
+                    .setPartitaMag(item.getPartitaMag())
+                    .setDataCollo(item.getDataCollo())
+                    .setSerCollo(item.getSerCollo())
+                    .setNumCollo(item.getNumCollo())
+                    .setGestione(item.getGestione())
+                    .setQtaTot(pickedQuantityDTO.getQtaTot())
+                    .setNumCnf(pickedQuantityDTO.getNumCnf())
+                    .setQtaCnf(pickedQuantityDTO.getQtaCnf())
+                    .setDataColloRif(item.getDataColloRif())
+                    .setSerColloRif(item.getSerColloRif())
+                    .setGestioneRif(item.getGestioneRif())
+                    .setNumColloRif(item.getNumColloRif())
+                    .setOrdini(ordiniRequest);
 
+            if(mtbColt != null) {
+                request.setMtbColtCarico(mtbColt);
             } else {
-                this.sendOnLoadingEnded();
+                request.setMtbColtCarico(sourceMtbColt);
             }
+
+            //se mtbColt != sourceMtbColt allora devo stampare
+
+            this.mMaterialiRESTConsumer.makeRecuperaRequest(request, updatedMtbColt -> {
+                this.sendOnLoadingEnded();
+            }, this::sendError);
         };
 
         if (sourceMtbColt != null) saveRunnable.run(sourceMtbColt, false);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULDTO.java
index 232a68c6..d4ddfb09 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULDTO.java
@@ -3,11 +3,9 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.dto;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.MtbAart;
-import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 
 public class HistoryVersamentoProdULDTO {
 
@@ -22,6 +20,7 @@ public class HistoryVersamentoProdULDTO {
     private String codJfas;
     private String descrizioneFase;
     private BigDecimal qtaCol;
+    private BigDecimal qtaCnf;
     private BigDecimal numCnf;
     private String partitaMag;
     private String codJcom;
@@ -38,8 +37,12 @@ public class HistoryVersamentoProdULDTO {
     private MtbAart mtbAart;
 
     public BigDecimal getQtaCnf() {
-        if(UtilityBigDecimal.equalsTo(numCnf, BigDecimal.ZERO)) return BigDecimal.ONE;
-        return qtaCol.divide(numCnf, 3, RoundingMode.HALF_EVEN);
+        return qtaCnf;
+    }
+
+    public HistoryVersamentoProdULDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
     }
 
     public String getGestione() {
@@ -251,7 +254,7 @@ public class HistoryVersamentoProdULDTO {
 
     public static class OrdineDto {
         private Integer numero;
-        private Date data;
+        private LocalDate data;
         private String gestione;
         private Integer rigaOrd;
         private BigDecimal qtaCol;
@@ -271,11 +274,11 @@ public class HistoryVersamentoProdULDTO {
             return this;
         }
 
-        public Date getData() {
+        public LocalDate getData() {
             return data;
         }
 
-        public HistoryVersamentoProdULDTO.OrdineDto setData(Date data) {
+        public HistoryVersamentoProdULDTO.OrdineDto setData(LocalDate data) {
             this.data = data;
             return this;
         }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULRestDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULRestDTO.java
index 0209834f..2e5363c0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULRestDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULRestDTO.java
@@ -2,9 +2,6 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.dto;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.Date;
-
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 public class HistoryVersamentoProdULRestDTO {
 
@@ -20,6 +17,7 @@ public class HistoryVersamentoProdULRestDTO {
     private String codJfas;
     private String descrizioneFase;
     private BigDecimal qtaCol;
+    private BigDecimal qtaCnf;
     private BigDecimal numCnf;
     private String partitaMag;
     private String codJcom;
@@ -32,7 +30,7 @@ public class HistoryVersamentoProdULRestDTO {
     private Integer numColloRif;
 
     private Integer numOrd;
-    private String dataOrd;
+    private LocalDate dataOrd;
     private String gestioneOrd;
     private Integer rigaOrd;
     private Integer percentageHr;
@@ -145,6 +143,15 @@ public class HistoryVersamentoProdULRestDTO {
         return this;
     }
 
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public HistoryVersamentoProdULRestDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
     public BigDecimal getNumCnf() {
         return numCnf;
     }
@@ -244,15 +251,11 @@ public class HistoryVersamentoProdULRestDTO {
         return this;
     }
 
-    public Date getDataOrdD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS());
-    }
-
-    public String getDataOrdS() {
+    public LocalDate getDataOrd() {
         return dataOrd;
     }
 
-    public HistoryVersamentoProdULRestDTO setDataOrd(String dataOrd) {
+    public HistoryVersamentoProdULRestDTO setDataOrd(LocalDate dataOrd) {
         this.dataOrd = dataOrd;
         return this;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java
similarity index 89%
rename from app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
rename to app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java
index edad0d23..c103c7ad 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java
@@ -4,10 +4,11 @@ import com.annimon.stream.Stream;
 import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import javax.inject.Singleton;
 
@@ -23,12 +24,12 @@ import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersa
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULRestDTO;
 
 @Singleton
-public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
+public class ProdRecuperoMaterialeRESTConsumer extends _BaseRESTConsumer {
 
     private final SystemRESTConsumer mSystemRESTConsumer;
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
 
-    public ProdRecuperMaterialeRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+    public ProdRecuperoMaterialeRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
         this.mSystemRESTConsumer = systemRESTConsumer;
         this.mArticoloRESTConsumer = articoloRESTConsumer;
     }
@@ -51,6 +52,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "           mtb_colr.cod_col, " +
                 "           mtb_colr.cod_tagl, " +
                 "           SUM(mtb_colr.qta_col)                                     AS qta_col, " +
+                "           mtb_colr.qta_cnf                                          AS qta_cnf, " +
                 "           SUM(mtb_colr.num_cnf)                                     AS num_cnf, " +
                 "           mtb_colr.partita_mag, " +
                 "           mtb_colr.cod_jcom, " +
@@ -62,11 +64,11 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "           ISNULL(mtb_aart.descrizione_estesa, mtb_aart.descrizione) AS descrizione_art, " +
                 "           mtb_aart.unt_mis, " +
                 "           MAX(datetime_row)                                         AS datetime_row, " +
-                "           dtb_ord_steps.num_ord, " +
-                "           dtb_ord_steps.data_ord, " +
-                "           dtb_ord_steps.gestione                                    as gestione_ord, " +
-                "           dtb_ord_steps.hr_num                                      as hr, " +
+                "           mtb_colr.num_ord, " +
+                "           mtb_colr.data_ord, " +
+                "           mtb_colr.gestione                                    as gestione_ord, " +
                 "           mtb_colr.riga_ord, " +
+                "           dtb_ord_steps.hr_num                                      as hr, " +
                 "           CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / " +
                 "                                   SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
                 "                                   SUM(CASE WHEN dtb_ord_steps.hr_num > 0 then dtb_ord_steps.hr_num else 1 end) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
@@ -93,6 +95,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "             mtb_colr.data_collo, " +
                 "             mtb_colr.num_collo, " +
                 "             mtb_colr.ser_collo, " +
+                "             mtb_colr.qta_cnf, " +
                 "             mtb_colr.cod_mart, " +
                 "             mtb_colr.cod_col, " +
                 "             mtb_colr.cod_tagl, " +
@@ -107,9 +110,9 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "             mtb_colr.ser_collo_rif, " +
                 "             mtb_colr.gestione_rif, " +
                 "             mtb_colt.segno, " +
-                "             dtb_ord_steps.num_ord, " +
-                "             dtb_ord_steps.data_ord, " +
-                "             dtb_ord_steps.gestione, " +
+                "             mtb_colr.num_ord, " +
+                "             mtb_colr.data_ord, " +
+                "             mtb_colr.gestione, " +
                 "             mtb_colr.riga_ord, " +
                 "             dtb_ord_steps.hr_num " +
                 "    HAVING SUM(mtb_colr.qta_col) > 0 " +
@@ -161,7 +164,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "             hr " +
                 ") " +
                 " " +
-                "SELECT qta_col, num_cnf, * FROM max_ul " +
+                "SELECT ul_list.* FROM max_ul " +
                 "LEFT OUTER JOIN ul_list ON " +
                 "            ISNULL(max_ul.cod_jfas, '') = ISNULL(ul_list.cod_jfas, '') AND " +
                 "            ISNULL(max_ul.descrizione_fase, '') = ISNULL(ul_list.descrizione_fase, '') AND " +
@@ -214,29 +217,30 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                     })
                     .forEach(restDTO -> {
 
-                        List<HistoryVersamentoProdULDTO.OrdineDto> ordineList = Stream.of(ulList)
+                        List<HistoryVersamentoProdULDTO.OrdineDto> ordineList = ulList.stream()
                                 .filter(x -> x.getNumCollo().equals(restDTO.getNumCollo()) &&
                                         x.getDataCollo().equals(restDTO.getDataCollo()) &&
                                         x.getSerCollo().equals(restDTO.getSerCollo()) &&
-                                        x.getGestione().equals(restDTO.getGestione()))
+                                        x.getGestione().equals(restDTO.getGestione()) &&
+                                        (x.getRigaOrd() == null || Objects.equals(x.getRigaOrd(), restDTO.getRigaOrd())))
                                 .map(x -> new HistoryVersamentoProdULDTO.OrdineDto()
-                                        .setData(x.getDataOrdD())
+                                        .setData(x.getDataOrd())
                                         .setNumero(x.getNumOrd())
-                                        .setGestione(x.getGestioneOrd())
+                                        .setGestione(x.getGestione())
                                         .setRigaOrd(x.getRigaOrd())
                                         .setQtaCol(x.getQtaCol())
                                         .setNumCnf(x.getNumCnf())
                                         .setPercentageHr(x.getPercentageHr()))
-                                .toList();
+                                .collect(Collectors.toList());
 
-                        BigDecimal qtaColTot = BigDecimal.ZERO;
-                        BigDecimal numCnfColTot = BigDecimal.ZERO;
-
-                        for (HistoryVersamentoProdULDTO.OrdineDto ordine :
-                                ordineList) {
-                            qtaColTot = qtaColTot.add(ordine.getQtaCol());
-                            numCnfColTot = numCnfColTot.add(ordine.getNumCnf());
-                        }
+//                        BigDecimal qtaColTot = BigDecimal.ZERO;
+//                        BigDecimal numCnfColTot = BigDecimal.ZERO;
+//
+//                        for (HistoryVersamentoProdULDTO.OrdineDto ordine :
+//                                ordineList) {
+//                            qtaColTot = qtaColTot.add(ordine.getQtaCol());
+//                            numCnfColTot = numCnfColTot.add(ordine.getNumCnf());
+//                        }
 
                         newUlList.add(new HistoryVersamentoProdULDTO()
                                 .setGestione(restDTO.getGestione())
@@ -250,8 +254,9 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                                 .setCodJfas(restDTO.getCodJfas())
                                 .setDescrizioneArt(restDTO.getDescrizioneArt())
                                 .setDescrizioneFase(restDTO.getDescrizioneFase())
-                                .setQtaCol(qtaColTot)
-                                .setNumCnf(numCnfColTot)
+                                .setQtaCol(restDTO.getQtaCol())
+                                .setQtaCnf(restDTO.getQtaCnf())
+                                .setNumCnf(restDTO.getNumCnf())
                                 .setPartitaMag(restDTO.getPartitaMag())
                                 .setCodJcom(restDTO.getCodJcom())
                                 .setDatetimeRow(restDTO.getDatetimeRow())
@@ -274,7 +279,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
 
                 this.mArticoloRESTConsumer.getByCodMarts(codMarts, arts -> {
 
-                    if (arts != null && arts.size() > 0) {
+                    if (arts != null && !arts.isEmpty()) {
                         for (HistoryVersamentoProdULDTO value : newUlList) {
 
                             MtbAart foundMtbAart = null;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
index c9da016c..ccc1b636 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
@@ -11,7 +11,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 public class OrdineLavorazioneDTO {
 
-    private String dataOrdProd;
+    private LocalDate dataOrdProd;
 
     private Integer numOrdProd;
 
@@ -109,11 +109,11 @@ public class OrdineLavorazioneDTO {
     private BindableFloat qtaColVersamento = new BindableFloat();
     private BindableFloat numCnfVersamento = new BindableFloat();
 
-    public String getDataOrdProd() {
+    public LocalDate getDataOrdProd() {
         return dataOrdProd;
     }
 
-    public void setDataOrdProd(String dataOrdProd) {
+    public void setDataOrdProd(LocalDate dataOrdProd) {
         this.dataOrdProd = dataOrdProd;
     }
 

From 998b1057e0b6330ece8ef5121d5c4435577ebb25 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 4 Feb 2025 09:55:34 +0100
Subject: [PATCH 094/103] Sostituiti controlli su size == 0 con isEmpty() sulle
 liste

---
 .../core/barcode_reader/BarcodeManager.java      |  4 ++--
 .../core/data_cache/DataCache.java               |  2 +-
 .../data_recover/ColliDataRecoverService.java    |  2 +-
 .../integrywmsnative/core/di/Converters.java     |  8 ++++----
 .../core/ean128/Ean128Service.java               |  6 +++---
 .../consumers/ColliMagazzinoRESTConsumer.java    |  6 +++---
 .../core/settings/SettingsManager.java           |  2 +-
 .../core/utility/PermissionsHelper.java          |  2 +-
 .../core/utility/UtilityLogger.java              |  2 +-
 .../core/utility/UtilityPosizione.java           |  2 +-
 .../AccettazioneBollaPickingActivity.java        |  4 ++--
 .../AccettazioneBollaPickingViewModel.java       |  4 ++--
 .../AccettazioneOrdiniPickingActivity.java       | 16 ++++++++--------
 .../AccettazioneOrdiniPickingViewModel.java      |  2 +-
 .../OrdiniUscitaElencoViewModel.java             |  4 ++--
 .../picking_libero/PickingLiberoFragment.java    |  4 ++--
 .../picking_libero/PickingLiberoViewModel.java   |  6 +++---
 .../gest/picking_resi/PickingResiViewModel.java  | 10 +++++-----
 .../rest/PickingResiRESTConsumer.java            |  6 +++---
 .../ProdDettaglioLineaViewModel.java             |  2 +-
 .../DialogAskMagazzinoProssimitaAdapter.java     |  2 +-
 .../rest/ProdRecuperoMaterialeRESTConsumer.java  |  2 +-
 .../ProdVersamentoMaterialeFragment.java         |  8 ++++----
 .../ProdVersamentoMaterialeViewModel.java        |  4 ++--
 .../ProdVersamentoMaterialeInBufferFragment.java |  2 +-
 .../PVOrdineAcquistoEditActivity.java            |  4 ++--
 .../PVOrdiniAcquistoGrigliaFragment.java         |  2 +-
 .../gest/spedizione/SpedizioneActivity.java      |  8 ++++----
 .../gest/spedizione/SpedizioneViewModel.java     | 12 ++++++------
 .../UltimeConsegneClienteFragment.java           |  2 +-
 .../UltimeConsegneClienteViewModel.java          |  2 +-
 .../UltimiArriviFornitoreFragment.java           |  2 +-
 .../UltimiArriviFornitoreViewModel.java          |  2 +-
 .../rest/UltimiArriviFornitoreRESTConsumer.java  |  2 +-
 .../VersamentoMerceViewModel.java                |  2 +-
 .../integrywmsnative/ui/StatusBarAlert.java      |  2 +-
 .../DialogAskCliente_Page1ViewModel.java         |  6 +++---
 ...logAskCliente_Page1_Cliente_ArrayAdapter.java |  2 +-
 ...ogAskCliente_Page1_Commessa_ArrayAdapter.java |  2 +-
 .../DialogAskCliente_Page2ViewModel.java         |  2 +-
 .../DialogAskCliente_Page2_ArrayAdapter.java     |  2 +-
 .../page1/DialogBasketLU_Page1_ViewModel.java    |  4 ++--
 .../page2/DialogBasketLU_Page2_ViewModel.java    |  4 ++--
 .../DialogChooseArtsFromMtbColrList.java         |  4 ++--
 .../input_lu_prod/DialogInputLUProdView.java     |  4 ++--
 .../dialogs/scan_art/DialogScanArtViewModel.java |  6 +++---
 .../DialogScanOrCreateLUViewModel.java           |  2 +-
 47 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java
index df16aa11..6a426201 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java
@@ -85,7 +85,7 @@ public class BarcodeManager {
 
     private static BarcodeCallbackDTO getValidCallback() {
 
-        if (mBarcodeCallbacksStacktrace.size() > 0) {
+        if (!mBarcodeCallbacksStacktrace.isEmpty()) {
             return mBarcodeCallbacksStacktrace.get(mBarcodeCallbacksStacktrace.size() - 1);
         } else {
             return null;
@@ -106,7 +106,7 @@ public class BarcodeManager {
 
         int newID = -1;
 
-        if (mBarcodeCallbacksStacktrace.size() > 0) {
+        if (!mBarcodeCallbacksStacktrace.isEmpty()) {
             newID = mBarcodeCallbacksStacktrace.get(mBarcodeCallbacksStacktrace.size() - 1).getID() + 1;
         } else {
             newID = 1;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_cache/DataCache.java b/app/src/main/java/it/integry/integrywmsnative/core/data_cache/DataCache.java
index 56556e71..554bcc48 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_cache/DataCache.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_cache/DataCache.java
@@ -30,7 +30,7 @@ public class DataCache {
 
         Object foundDataCache = null;
 
-        if(dataCacheTemp != null && dataCacheTemp.size() > 0) {
+        if(dataCacheTemp != null && !dataCacheTemp.isEmpty()) {
             foundDataCache = dataCacheTemp.get(0).getItem();
             dataCacheList.remove(dataCacheTemp.get(0));
         }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java
index 9c1691b9..ed791a05 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java
@@ -46,7 +46,7 @@ public class ColliDataRecoverService {
     }
 
     public boolean thereIsAnExistantSession() {
-        return mtbColtsSessions != null && mtbColtsSessions.size() > 0;
+        return mtbColtsSessions != null && !mtbColtsSessions.isEmpty();
     }
 
     public List<Integer> getAllSessionIDs() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
index b33fedd6..dbadd7a5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
@@ -354,7 +354,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         BigDecimal newValue = bindableBigDecimal.get();
-        BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -381,7 +381,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         Integer newValue = bindableInteger.get();
-        Integer viewValue = view.getText().toString().trim().length() > 0 ? Integer.valueOf(view.getText().toString()) : Integer.valueOf(0);
+        Integer viewValue = !view.getText().toString().trim().isEmpty() ? Integer.valueOf(view.getText().toString()) : Integer.valueOf(0);
 
         if (!(viewValue.compareTo(newValue) == 0)) {
             view.setText(newValue.toString());
@@ -432,7 +432,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         Integer newValue = observableInteger.get();
-        Integer viewValue = view.getText().toString().trim().length() > 0 ? Integer.valueOf(view.getText().toString()) : Integer.valueOf(0);
+        Integer viewValue = !view.getText().toString().trim().isEmpty() ? Integer.valueOf(view.getText().toString()) : Integer.valueOf(0);
 
         if (!viewValue.equals(newValue) && newValue != null) {
             view.setText(newValue.toString());
@@ -459,7 +459,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         Long newValue = observableLong.get();
-        Long viewValue = view.getText().toString().trim().length() > 0 ? Long.valueOf(view.getText().toString()) : Long.valueOf(0);
+        Long viewValue = !view.getText().toString().trim().isEmpty() ? Long.valueOf(view.getText().toString()) : Long.valueOf(0);
 
         if (!viewValue.equals(newValue) && newValue != null) {
             view.setText(newValue.toString());
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java b/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java
index c5405de0..cf88f57b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java
@@ -66,19 +66,19 @@ public class Ean128Service {
 
                     switch (aiModel.AI) {
                         case SSCC -> {
-                            if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
+                            if (!aiValue.isEmpty() && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
                                 aiValue = new StringBuilder(aiValue.substring(1));
                             }
                             model.Sscc = aiValue.toString();
                         }
                         case GTIN -> {
-                            if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
+                            if (!aiValue.isEmpty() && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
                                 aiValue = new StringBuilder(aiValue.substring(1));
                             }
                             model.Gtin = aiValue.toString();
                         }
                         case CONTENT -> {
-                            if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
+                            if (!aiValue.isEmpty() && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
                                 aiValue = new StringBuilder(aiValue.substring(1));
                             }
                             model.Content = aiValue.toString();
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
index 1c868fa7..53a9e3bd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
@@ -327,7 +327,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
         ArticoloRESTConsumer.getByCodMartsStatic(codMarts, arts -> {
 
-            if (arts != null && arts.size() > 0) {
+            if (arts != null && !arts.isEmpty()) {
                 for (MtbColt mtbColt : mtbColts) {
                     for (MtbColr mtbColr : mtbColt.getMtbColr()) {
 
@@ -336,7 +336,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                         List<MtbAart> mtbAartStream = Stream.of(arts)
                                 .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart())).toList();
 
-                        if (mtbAartStream != null && mtbAartStream.size() > 0) {
+                        if (mtbAartStream != null && !mtbAartStream.isEmpty()) {
                             foundMtbAart = mtbAartStream.get(0);
                         }
 
@@ -392,7 +392,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                     public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
                         analyzeAnswer(response, "getColloInGiac", mtbColt -> {
 
-                            if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+                            if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
                                 List<MtbColt> mtbColtList = new ArrayList<>();
                                 mtbColtList.add(mtbColt);
                                 fillMtbAartsOfMtbColts(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index 9d6d415a..f0850073 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -190,7 +190,7 @@ public class SettingsManager {
         mSystemRESTConsumer.getAvailableCodMdeps(availableCodMdeps -> {
             dbSettingsModelIstance.setAvailableCodMdep(availableCodMdeps);
 
-            if (availableCodMdeps == null || availableCodMdeps.size() == 0) {
+            if (availableCodMdeps == null || availableCodMdeps.isEmpty()) {
                 onFailed.run(new Exception(mContext.getText(R.string.no_codmdep_available).toString()));
                 return;
             }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/PermissionsHelper.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/PermissionsHelper.java
index 6ffca0e4..090bb742 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/PermissionsHelper.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/PermissionsHelper.java
@@ -51,7 +51,7 @@ public class PermissionsHelper {
                 boolean allGranted = Stream.of(grantResults).allMatch(x -> x == PackageManager.PERMISSION_GRANTED);
 
                 // If request is cancelled, the result arrays are empty.
-                if (grantResults.size() > 0 && allGranted) {
+                if (!grantResults.isEmpty() && allGranted) {
                     onPermissionsConfirmed.run();
 
                 } else {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java
index 3dec6240..627860df 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java
@@ -88,7 +88,7 @@ public class UtilityLogger {
 
         }
 
-        return callerNew.length() > 0 ? callerNew.toString() : caller;
+        return !callerNew.isEmpty() ? callerNew.toString() : caller;
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityPosizione.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityPosizione.java
index de3b328f..69bda286 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityPosizione.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityPosizione.java
@@ -37,7 +37,7 @@ public class UtilityPosizione {
         List<MtbDepoPosizione> tmpList = Stream.of(availablePosizioni)
                 .filter(x -> x.getPosizione().equalsIgnoreCase(posizione)).toList();
 
-        if(tmpList.size() > 0) return tmpList.get(0);
+        if(!tmpList.isEmpty()) return tmpList.get(0);
         else return null;
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
index 10d5a499..e61ca249 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
@@ -377,7 +377,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
                     //Calc Num CNF
                     BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-                    if (x.getWithdrawMtbColrs().size() > 0) {
+                    if (!x.getWithdrawMtbColrs().isEmpty()) {
                         numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
                                 .map(MtbColr::getNumCnf)
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -386,7 +386,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
                     //Calc qta col
                     BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-                    if (x.getWithdrawMtbColrs().size() > 0) {
+                    if (!x.getWithdrawMtbColrs().isEmpty()) {
                         qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
                                 .map(MtbColr::getQtaCol)
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
index 300b2d09..1c666717 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
@@ -286,7 +286,7 @@ public class AccettazioneBollaPickingViewModel {
     private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) {
         this.mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> {
 
-            if (mtbAartList != null && mtbAartList.size() > 0) {
+            if (mtbAartList != null && !mtbAartList.isEmpty()) {
                 this.searchArtFromAnag(mtbAartList.get(0), pickData, onComplete);
             } else {
                 this.manageUnknownBarcode(barcodeProd, onComplete);
@@ -310,7 +310,7 @@ public class AccettazioneBollaPickingViewModel {
     }
 
     private void loadMatchedRows(List<PickingObjectDTO> matchedRows, MtbAart mtbAart, PickDataDTO pickDataDTO) {
-        if (matchedRows == null || matchedRows.size() == 0) {
+        if (matchedRows == null || matchedRows.isEmpty()) {
             manageNoArtFound(mtbAart, pickDataDTO);
         } else if (matchedRows.size() == 1) {
             this.manageDispatchBollaRow(matchedRows.get(0));
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
index 483247d9..b6ec5a0b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
@@ -414,14 +414,14 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
             //Calc Num CNF
             BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-            if (x.getWithdrawMtbColrs().size() > 0) {
+            if (!x.getWithdrawMtbColrs().isEmpty()) {
                 numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
             }
 
             //Calc qta col
             BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-            if (x.getWithdrawMtbColrs().size() > 0) {
+            if (!x.getWithdrawMtbColrs().isEmpty()) {
                 qtaEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add);
             }
 
@@ -472,14 +472,14 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
             //Calc Num CNF
             BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-            if (x.getWithdrawMtbColrs().size() > 0) {
+            if (!x.getWithdrawMtbColrs().isEmpty()) {
                 numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
             }
 
             //Calc qta col
             BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-            if (x.getWithdrawMtbColrs().size() > 0) {
+            if (!x.getWithdrawMtbColrs().isEmpty()) {
                 qtaEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add);
             }
 
@@ -527,14 +527,14 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
             //Calc Num CNF
             BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-            if (x.getWithdrawMtbColrs().size() > 0) {
+            if (!x.getWithdrawMtbColrs().isEmpty()) {
                 numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
             }
 
             //Calc qta col
             BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-            if (x.getWithdrawMtbColrs().size() > 0) {
+            if (!x.getWithdrawMtbColrs().isEmpty()) {
                 qtaEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add);
             }
 
@@ -583,14 +583,14 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
             //Calc Num CNF
             BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-            if (x.getWithdrawMtbColrs().size() > 0) {
+            if (!x.getWithdrawMtbColrs().isEmpty()) {
                 numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
             }
 
             //Calc qta col
             BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-            if (x.getWithdrawMtbColrs().size() > 0) {
+            if (!x.getWithdrawMtbColrs().isEmpty()) {
                 qtaEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add);
             }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
index 415660e7..ca9d12d5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
@@ -369,7 +369,7 @@ public class AccettazioneOrdiniPickingViewModel {
     private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) {
         this.mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> {
 
-            if (mtbAartList != null && mtbAartList.size() > 0) {
+            if (mtbAartList != null && !mtbAartList.isEmpty()) {
                 this.searchArtFromAnag(mtbAartList.get(0), pickData, onComplete);
             } else {
                 this.sendError(new NoResultFromBarcodeException(barcodeProd));
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java
index 51db01ad..b9a491b9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java
@@ -208,13 +208,13 @@ public class OrdiniUscitaElencoViewModel {
     private void executeEtichettaLU(String SSCC, RunnableArgs<List<OrdiniUscitaElencoDTO>> onComplete) {
         this.mColliMagazzinoRESTConsumer.getBySSCC(SSCC, true, false, mtbColt -> {
 
-            if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+            if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
 
                 if (mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) {
                     //GET BY COMMESSA COLLO
                     this.mOrdiniUscitaElencoRESTConsumer.getOrdiniFromCommessaCollo(mCurrentCodMdep, mtbColt, orderList -> {
 
-                        if (orderList != null && orderList.size() > 0) {
+                        if (orderList != null && !orderList.isEmpty()) {
                             List<Integer> numOrds = Stream.of(orderList)
                                     .map(DtbOrdt::getNumOrd)
                                     .toList();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
index fd94aff5..4af25784 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
@@ -247,12 +247,12 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
             initAdapter();
 
             thereIsAnOpenedUL.set(true);
-            thereIsAnyRowInUL.set(mtbColt.getMtbColr().size() > 0, true);
+            thereIsAnyRowInUL.set(!mtbColt.getMtbColr().isEmpty(), true);
 
             mtbColt.getMtbColr().addOnListChangedCallback(new OnListGeneralChangedCallback() {
                 @Override
                 public void onChanged(ObservableList sender) {
-                    thereIsAnyRowInUL.set(mtbColt.getMtbColr().size() > 0, true);
+                    thereIsAnyRowInUL.set(!mtbColt.getMtbColr().isEmpty(), true);
                 }
             });
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
index e946dea0..6876aa3c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
@@ -215,7 +215,7 @@ public class PickingLiberoViewModel {
     private void executePosizione(MtbDepoPosizione posizione, MtbAart articolo, Runnable onComplete) {
         this.mPosizioniRESTConsumer.getBancaliInPosizione(posizione, mtbColtList -> {
 
-            if (mtbColtList == null || mtbColtList.size() == 0) {
+            if (mtbColtList == null || mtbColtList.isEmpty()) {
                 if (articolo != null) {
                     this.dispatchArt(articolo, null);
                 } else {
@@ -298,7 +298,7 @@ public class PickingLiberoViewModel {
 
     private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Runnable onComplete) {
         mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> {
-            if (mtbAartList != null && mtbAartList.size() > 0) {
+            if (mtbAartList != null && !mtbAartList.isEmpty()) {
                 MtbAart articolo = mtbAartList.get(0);
                 MtbDepoPosizione posizione = UtilityPosizione.getFromCache(articolo.getPosizione());
 
@@ -730,7 +730,7 @@ public class PickingLiberoViewModel {
 
             MtbColr mtbColrRif = null;
 
-            if (mtbColrRifs != null && mtbColrRifs.size() > 0) {
+            if (mtbColrRifs != null && !mtbColrRifs.isEmpty()) {
                 //TODO: Da capire se è necessario controllare anche il cod_jcom
                 mtbColrRif = Stream.of(mtbColrRifs)
                         .filter(x -> UtilityString.equalsIgnoreCase(x.getCodMart(), mtbColrToUpdate.getCodMart()) &&
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java
index c3675d75..908b6d88 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java
@@ -332,7 +332,7 @@ public class PickingResiViewModel {
     private void executeEtichettaLU(String SSCC, Runnable onComplete) {
         mColliMagazzinoRESTConsumer.getBySSCC(SSCC, true, false, mtbColt -> {
 
-            if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+            if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
                 if (mtbColt.getSegno() != -1) {
                     searchArtFromUL(mtbColt, onComplete);
                 } else this.sendError(new InvalidLUException());
@@ -420,7 +420,7 @@ public class PickingResiViewModel {
 
 
     private void loadMatchedRows(List<WithdrawableDtbDocr> matchedRows) {
-        if (matchedRows == null || matchedRows.size() == 0) {
+        if (matchedRows == null || matchedRows.isEmpty()) {
             this.sendError(new NoResultFromBarcodeException());
         } else if (matchedRows.size() == 1) {
             WithdrawableDtbDocr matchedItem = matchedRows.get(0);
@@ -464,7 +464,7 @@ public class PickingResiViewModel {
         MtbColr mtbColrToDispatch = withdrawableDtbDocr.getTempPickData() != null &&
                 withdrawableDtbDocr.getTempPickData().getSourceMtbColt() != null &&
                 withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr() != null &&
-                withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr().size() > 0 ?
+                !withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr().isEmpty() ?
                 withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr().get(0) : null;
 
         BigDecimal totalAvailableQtaCol;
@@ -553,7 +553,7 @@ public class PickingResiViewModel {
         MtbColr mtbColrToDispatch = withdrawableDtbDocr.getTempPickData() != null &&
                 withdrawableDtbDocr.getTempPickData().getSourceMtbColt() != null &&
                 withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr() != null &&
-                withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr().size() > 0 ?
+                !withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr().isEmpty() ?
                 withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr().get(0) : null;
 
         if (mtbColrToDispatch != null) {
@@ -593,7 +593,7 @@ public class PickingResiViewModel {
         boolean shouldPrint = true;
 
         //Se è l'unico articolo del collo (controllo se è uguale a 0 perché ancora non è stato aggiunto nella lista delle righe)
-        if (shouldCloseLU && mCurrentMtbColt.getMtbColr().size() == 0) {
+        if (shouldCloseLU && mCurrentMtbColt.getMtbColr().isEmpty()) {
             shouldPrint = false;
         }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/rest/PickingResiRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/rest/PickingResiRESTConsumer.java
index 159e227d..9cf6b343 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/rest/PickingResiRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/rest/PickingResiRESTConsumer.java
@@ -56,7 +56,7 @@ public class PickingResiRESTConsumer {
         Type typeOfObjectsList = new TypeToken<ArrayList<WithdrawableDtbDocr>>() {}.getType();
         this.mSystemRestConsumer.<ArrayList<WithdrawableDtbDocr>>processSql(sql, typeOfObjectsList, values -> {
 
-                if(values != null && values.size() > 0){
+                if(values != null && !values.isEmpty()){
                     List<String> codMarts = Stream.of(values)
                             .map(DtbDocr::getCodMart)
                             .withoutNulls()
@@ -65,7 +65,7 @@ public class PickingResiRESTConsumer {
 
                     mArticoloRESTConsumer.getByCodMarts(codMarts, arts -> {
 
-                        if(arts != null && arts.size() > 0) {
+                        if(arts != null && !arts.isEmpty()) {
                             for (DtbDocr value : values) {
 
                                 MtbAart foundMtbAart = null;
@@ -73,7 +73,7 @@ public class PickingResiRESTConsumer {
                                 List<MtbAart> mtbAartStream = Stream.of(arts)
                                         .filter(x -> x.getCodMart().equalsIgnoreCase(value.getCodMart())).toList();
 
-                                if(mtbAartStream != null && mtbAartStream.size() > 0){
+                                if(mtbAartStream != null && !mtbAartStream.isEmpty()){
                                     foundMtbAart = mtbAartStream.get(0);
                                 }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaViewModel.java
index e2632733..adc601d1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaViewModel.java
@@ -99,7 +99,7 @@ public class ProdDettaglioLineaViewModel {
 
     private void checkOrdersCompatibility(MtbColt mtbColt, Runnable onComplete) {
         mesRESTConsumer.getOrdiniLavorazioneMateriale(lineaProd.getValue().getCodJfas(), getIdMaterialeFromCollo(mtbColt), ordini -> {
-            if (ordini != null && ordini.size() > 0) {
+            if (ordini != null && !ordini.isEmpty()) {
                 onComplete.run();
             } else {
                 this.mListener.confirmInconsistentDeposit(onComplete);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaAdapter.java
index 63a25200..5e4a9be5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaAdapter.java
@@ -70,7 +70,7 @@ public class DialogAskMagazzinoProssimitaAdapter extends ArrayAdapter<JtbFasi> i
                 }
             }
 
-            if (prefix == null || prefix.length() == 0) {
+            if (prefix == null || prefix.isEmpty()) {
                 synchronized (lock) {
                     results.values = mDatasetAllItems;
                     results.count = mDatasetAllItems.size();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java
index c103c7ad..394459d9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java
@@ -287,7 +287,7 @@ public class ProdRecuperoMaterialeRESTConsumer extends _BaseRESTConsumer {
                             List<MtbAart> mtbAartStream = Stream.of(arts)
                                     .filter(x -> x.getCodMart().equalsIgnoreCase(value.getCodMart())).toList();
 
-                            if (mtbAartStream != null && mtbAartStream.size() > 0) {
+                            if (mtbAartStream != null && !mtbAartStream.isEmpty()) {
                                 foundMtbAart = mtbAartStream.get(0);
                             }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java
index 56eaacb9..fda72b03 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java
@@ -255,12 +255,12 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
                 .mapToInt(x -> x.getOriginalOrdineLavorazione().getHrNum())
                 .sum();
 
-        if (selectedOrders.size() > 0 && totalHr <= 0) {
+        if (!selectedOrders.isEmpty() && totalHr <= 0) {
             this.onError(new Exception("Il totale delle <b>risorse umane</b> è pari a 0"));
             return;
         }
 
-        fabVisible.set(selectedOrders.size() > 0);
+        fabVisible.set(!selectedOrders.isEmpty());
 
         for (VersamentoMerceOrdineLavListModel versamentoMerceOrdineLavListModel : this.mCurrentOrders) {
             versamentoMerceOrdineLavListModel.setNumCnfBigDecimal(BigDecimal.ZERO);
@@ -304,7 +304,7 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
         }
 
 
-        if (selectedOrders.size() > 0) {
+        if (!selectedOrders.isEmpty()) {
             VersamentoMerceOrdineLavListModel majorOrder =
                     Stream.of(selectedOrders)
                             .max((o1, o2) -> Integer.compare(o1.getOriginalOrdineLavorazione().getHrNum(), o2.getOriginalOrdineLavorazione().getHrNum())).get();
@@ -334,7 +334,7 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
                 .map(VersamentoMerceOrdineLavListModel::getOriginalOrdineLavorazione)
                 .toList();
 
-        if (selectedOrders.size() > 0) {
+        if (!selectedOrders.isEmpty()) {
             this.mViewModel.save(selectedOrders);
         } else {
             Toast.makeText(requireActivity(), "Nessun ordine selezionato!", Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeViewModel.java
index 6aab6a26..b4484c1a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeViewModel.java
@@ -106,7 +106,7 @@ public class ProdVersamentoMaterialeViewModel {
     private void executePosizione(MtbDepoPosizione posizione) {
         this.mPosizioniRESTConsumer.getBancaliInPosizione(posizione, mtbColtList -> {
 
-            if (mtbColtList == null || mtbColtList.size() == 0) {
+            if (mtbColtList == null || mtbColtList.isEmpty()) {
                 this.sendError(new NoLUFoundException());
             } else if (mtbColtList.size() == 1) {
                 this.mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> {
@@ -172,7 +172,7 @@ public class ProdVersamentoMaterialeViewModel {
 
     private void loadArticolo(String barcodeProd, Ean128Model ean128Model) {
         mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> {
-            if (mtbAartList != null && mtbAartList.size() > 0) {
+            if (mtbAartList != null && !mtbAartList.isEmpty()) {
                 MtbAart articolo = mtbAartList.get(0);
                 this.dispatchArt(articolo, ean128Model);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale_su_mag_prossimita/ProdVersamentoMaterialeInBufferFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale_su_mag_prossimita/ProdVersamentoMaterialeInBufferFragment.java
index ce605a77..77789eeb 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale_su_mag_prossimita/ProdVersamentoMaterialeInBufferFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale_su_mag_prossimita/ProdVersamentoMaterialeInBufferFragment.java
@@ -76,7 +76,7 @@ public class ProdVersamentoMaterialeInBufferFragment extends BaseFragment implem
                     mtbColt.getGestioneEnum() == GestioneEnum.VENDITA) &&
                     mtbColt.getSegno() == 1) {
 
-                if (mtbColt.getMtbColr() == null || mtbColt.getMtbColr().size() == 0) {
+                if (mtbColt.getMtbColr() == null || mtbColt.getMtbColr().isEmpty()) {
                     DialogSimpleMessageView.makeWarningDialog(
                                     new SpannableString(Html.fromHtml("E' stata scansionata una UL già vuota")),
                                     null, this::openLU)
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java
index e14a5f8f..e4997378 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java
@@ -109,9 +109,9 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi
 
         this.mViewModel.getArticoli().observe(this, articoli -> {
             mBinding.countArtOrd.setText(String.valueOf(articoli.size()));
-            mBinding.pvOrdineExport.setVisibility(articoli.size() > 0 ? View.INVISIBLE : View.GONE);
+            mBinding.pvOrdineExport.setVisibility(!articoli.isEmpty() ? View.INVISIBLE : View.GONE);
             mBinding.closeActivityFab.close(false);
-            mBinding.scanArtSpinner.setVisibility(articoli.size() > 0 ? View.GONE : View.VISIBLE);
+            mBinding.scanArtSpinner.setVisibility(!articoli.isEmpty() ? View.GONE : View.VISIBLE);
 
             if (ordine.isOrderNewProducts() && articoli.isEmpty() && isOrderNewProdsForced()) {
                 this.mViewModel.orderNewProducts();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java
index f136e32e..ff4633f4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java
@@ -187,7 +187,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends BaseFragment implements ITi
     }
 
     private void setOrdini(List<OrdineWrapper> ordini) {
-        mBinding.ordiniAApertiMainList.setVisibility(ordini != null && ordini.size() > 0 ? View.VISIBLE : View.GONE);
+        mBinding.ordiniAApertiMainList.setVisibility(ordini != null && !ordini.isEmpty() ? View.VISIBLE : View.GONE);
         mBinding.ordiniAEmptyView.setVisibility(ordini == null || ordini.size() <= 0 ? View.VISIBLE : View.GONE);
         refreshRenderedOrdini(ordini);
         mAdapter.updateItems(mRenderedOrderList);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index 06ee0577..ed0306d6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -369,7 +369,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                         }
 
 
-                        boolean anyLUPresent = x.getMtbColts() != null && x.getMtbColts().size() > 0;
+                        boolean anyLUPresent = x.getMtbColts() != null && !x.getMtbColts().isEmpty();
 
                         spedizioneListModel.setActive(mEnableFakeGiacenza || anyLUPresent);
 
@@ -422,7 +422,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
                                 cloneModel.setGroupTitle(String.format("%s: %s", getString(R.string.position_text), UtilityString.isNullOrEmpty(mtbColtToPick.getPosizione()) ? "N.A." : mtbColtToPick.getPosizione()));
 
-                                MtbColr mtbColrToDispatch = mtbColtToPick.getMtbColr() != null && mtbColtToPick.getMtbColr().size() > 0 ? mtbColtToPick.getMtbColr().get(0) : null;
+                                MtbColr mtbColrToDispatch = mtbColtToPick.getMtbColr() != null && !mtbColtToPick.getMtbColr().isEmpty() ? mtbColtToPick.getMtbColr().get(0) : null;
                                 if (mtbColrToDispatch != null) {
                                     if (!UtilityString.isNullOrEmpty(mtbColrToDispatch.getPartitaMag()))
                                         cloneModel.setSubDescrizione1(String.format(getString(R.string.batch_lot_text), mtbColrToDispatch.getPartitaMag()));
@@ -539,7 +539,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                         }
 
 
-                        boolean anyLUPresent = x.getMtbColts() != null && x.getMtbColts().size() > 0;
+                        boolean anyLUPresent = x.getMtbColts() != null && !x.getMtbColts().isEmpty();
 
                         spedizioneListModel.setActive(mEnableFakeGiacenza || anyLUPresent);
 
@@ -595,7 +595,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                                 SpedizioneListModel cloneModel = (SpedizioneListModel) spedizioneListModel.clone();
 
 
-                                MtbColr mtbColrToDispatch = mtbColtToPick.getMtbColr() != null && mtbColtToPick.getMtbColr().size() > 0 ? mtbColtToPick.getMtbColr().get(0) : null;
+                                MtbColr mtbColrToDispatch = mtbColtToPick.getMtbColr() != null && !mtbColtToPick.getMtbColr().isEmpty() ? mtbColtToPick.getMtbColr().get(0) : null;
                                 if (mtbColrToDispatch != null) {
                                     if (!UtilityString.isNullOrEmpty(mtbColrToDispatch.getPartitaMag()))
                                         cloneModel.setSubDescrizione1(String.format(getString(R.string.batch_lot_text), mtbColrToDispatch.getPartitaMag()));
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 223244da..e1bc5ec4 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
@@ -614,7 +614,7 @@ public class SpedizioneViewModel {
             }
 
             mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> {
-                if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+                if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
 
                     boolean codMdepIsValid = SettingsManager.iDB().getAvailableCodMdep().stream()
                             .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
@@ -636,7 +636,7 @@ public class SpedizioneViewModel {
     private void executeEtichettaLU(String SSCC, Runnable onComplete) {
         mColliMagazzinoRESTConsumer.getBySSCC(SSCC, true, false, mtbColt -> {
 
-            if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+            if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
                 if (mtbColt.getSegno() != -1) {
 
                     boolean codMdepIsValid = SettingsManager.iDB().getAvailableCodMdep().stream()
@@ -1135,7 +1135,7 @@ public class SpedizioneViewModel {
     private void loadProductLotStatus(String codMart, String partitaMag, RunnableArgs<StatoArticoloDTO> onComplete) {
         this.sendOnLoadingStarted();
         this.mArticoloRESTConsumer.getStatoPartita(codMart, partitaMag, stati -> {
-            onComplete.run(stati.size() > 0 ? stati.get(0) : null);
+            onComplete.run(!stati.isEmpty() ? stati.get(0) : null);
         }, this::sendError);
     }
 
@@ -1306,7 +1306,7 @@ public class SpedizioneViewModel {
 
             MtbColr mtbColrRif = null;
 
-            if (mtbColrRifs != null && mtbColrRifs.size() > 0) {
+            if (mtbColrRifs != null && !mtbColrRifs.isEmpty()) {
                 //TODO: Da capire se è necessario controllare anche il cod_jcom
                 Optional<MtbColr> optionalMtbColr =
                         mtbColrRifs.stream()
@@ -1407,10 +1407,10 @@ public class SpedizioneViewModel {
         final MtbColr mtbColrToDispatch = pickingObjectDTO.getTempPickData() != null &&
                 pickingObjectDTO.getTempPickData().getSourceMtbColt() != null &&
                 pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr() != null &&
-                pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr().size() > 0 ?
+                !pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr().isEmpty() ?
                 pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr().get(0) : null;
 
-        boolean shouldPrint = !shouldCloseLU || mCurrentMtbColt.getMtbColr().size() != 0;
+        boolean shouldPrint = !shouldCloseLU || !mCurrentMtbColt.getMtbColr().isEmpty();
 
         //Se è l'unico articolo del collo (controllo se è uguale a 0 perché ancora non è stato aggiunto nella lista delle righe)
         if (UtilityBigDecimal.equalsTo(numCnf, BigDecimal.ZERO) && UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO)) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java
index 11d1fc4e..705c174a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java
@@ -197,7 +197,7 @@ public class UltimeConsegneClienteFragment extends BaseFragment implements Ultim
                     .forEach(x -> x.setSelected(false));
         }
 
-        if (selectedOrders != null && selectedOrders.size() > 0) {
+        if (selectedOrders != null && !selectedOrders.isEmpty()) {
             mBindings.mainFab.show();
         } else {
             mBindings.mainFab.hide();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteViewModel.java
index 7bb95f7d..aa4385e6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteViewModel.java
@@ -92,7 +92,7 @@ public class UltimeConsegneClienteViewModel {
     private void executeEtichettaLU(String SSCC, RunnableArgs<List<OrdiniUscitaElencoDTO>> onComplete) {
         this.mColliMagazzinoRESTConsumer.getBySSCC(SSCC, true, false, mtbColt -> {
 
-            if(mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+            if(mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
 
 //                if(mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) {
 //                    //GET BY COMMESSA COLLO
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java
index 106894eb..239deef7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java
@@ -199,7 +199,7 @@ public class UltimiArriviFornitoreFragment extends BaseFragment implements ITitl
                     .forEach(x -> x.setSelected(false));
         }
 
-        if (selectedOrders != null && selectedOrders.size() > 0) {
+        if (selectedOrders != null && !selectedOrders.isEmpty()) {
             mBindings.mainFab.show();
         } else {
             mBindings.mainFab.hide();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreViewModel.java
index 0e972f67..7bce508a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreViewModel.java
@@ -93,7 +93,7 @@ public class UltimiArriviFornitoreViewModel {
     private void executeEtichettaLU(String SSCC, Runnable onComplete) {
         this.mColliMagazzinoRESTConsumer.getBySSCC(SSCC, true, false, mtbColt -> {
 
-            if(mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+            if(mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
                 if(mtbColt.getSegno() > 0) {
 
                     this.sendOnMtbColtScanned(mtbColt);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java
index d53fd61c..f89297a6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java
@@ -45,7 +45,7 @@ public class UltimiArriviFornitoreRESTConsumer {
     public void getUltimeConsegneFornitori(String codMdep, String codAnag, List<MtbAart> mtbAarts, int limitConsegnePerCli, int limitDays, RunnableArgs<ArrayList<DocumentoResoDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         String codMarts = null;
 
-        if (mtbAarts != null && mtbAarts.size() > 0) {
+        if (mtbAarts != null && !mtbAarts.isEmpty()) {
             codMarts = StringUtils.join(Stream.of(mtbAarts)
                     .map(MtbAart::getCodMart)
                     .toList(), "|");
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java
index 9761a9f4..62d37e55 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java
@@ -130,7 +130,7 @@ public class VersamentoMerceViewModel {
     private void executePosizioneMonocollo(Runnable onComplete, MtbDepoPosizione foundPosizione) {
         this.mPosizioniRESTConsumer.getBancaliInPosizione(foundPosizione, mtbColtList -> {
 
-            if (mtbColtList == null || mtbColtList.size() == 0) {
+            if (mtbColtList == null || mtbColtList.isEmpty()) {
                 this.sendError(new NoLUFoundException());
             } else if (mtbColtList.size() == 1) {
                 mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> {
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java b/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java
index 0a7e1ed4..60fb2a74 100644
--- a/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java
@@ -247,7 +247,7 @@ public class StatusBarAlert {
                             break label48;
                         }
 
-                        if (var9.size() != 0) {
+                        if (!var9.isEmpty()) {
                             break label48;
                         }
                     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java
index 905cdc43..3e038d83 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java
@@ -124,7 +124,7 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod
         List<DialogAskClienteClienteDTO> resultCodAnag = Stream.of(availableClienti)
                 .filter(x -> barcode.equalsIgnoreCase(x.getCodAnag()))
                 .toList();
-        if (resultCodAnag.size() > 0) {
+        if (!resultCodAnag.isEmpty()) {
             return resultCodAnag.get(0);
         } else return null;
     }
@@ -133,7 +133,7 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod
         List<DialogAskClienteClienteDTO> resultCodJcom = Stream.of(availableClienti)
                 .filter(x -> x.getCodJcoms().contains(barcode))
                 .toList();
-        if (resultCodJcom.size() > 0) {
+        if (!resultCodJcom.isEmpty()) {
             return resultCodJcom.get(0);
         } else return null;
     }
@@ -182,7 +182,7 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod
 
 
     private boolean validateCliente() {
-        if (SettingsManager.iDB().isFlagPickLiberoAllowEmptyCliente() && mBinding.inputCliente.getEditText().getText().toString().trim().length() == 0) {
+        if (SettingsManager.iDB().isFlagPickLiberoAllowEmptyCliente() && mBinding.inputCliente.getEditText().getText().toString().trim().isEmpty()) {
             return true;
         } else return getCurrentCliente() != null;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Cliente_ArrayAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Cliente_ArrayAdapter.java
index 26ada95a..0d47ce04 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Cliente_ArrayAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Cliente_ArrayAdapter.java
@@ -72,7 +72,7 @@ public class DialogAskCliente_Page1_Cliente_ArrayAdapter extends ArrayAdapter<Di
                 }
             }
 
-            if (prefix == null || prefix.length() == 0) {
+            if (prefix == null || prefix.isEmpty()) {
                 synchronized (lock) {
                     results.values = mDatasetAllItems;
                     results.count = mDatasetAllItems.size();
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Commessa_ArrayAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Commessa_ArrayAdapter.java
index 93031215..f12c4caa 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Commessa_ArrayAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Commessa_ArrayAdapter.java
@@ -67,7 +67,7 @@ public class DialogAskCliente_Page1_Commessa_ArrayAdapter extends ArrayAdapter<S
                 }
             }
 
-            if (prefix == null || prefix.length() == 0) {
+            if (prefix == null || prefix.isEmpty()) {
                 synchronized (lock) {
                     results.values = mDatasetAllItems;
                     results.count = mDatasetAllItems.size();
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java
index 6c08204f..df19b7b8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java
@@ -53,7 +53,7 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
                 : null;
 
 
-        if (filteredDestinatari == null || filteredDestinatari.size() == 0) {
+        if (filteredDestinatari == null || filteredDestinatari.isEmpty()) {
             mOnConfirm.run();
             return;
         }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2_ArrayAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2_ArrayAdapter.java
index 0e4d9e51..a8109930 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2_ArrayAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2_ArrayAdapter.java
@@ -89,7 +89,7 @@ public class DialogAskCliente_Page2_ArrayAdapter extends ArrayAdapter<DialogAskC
                 }
             }
 
-            if (prefix == null || prefix.length() == 0) {
+            if (prefix == null || prefix.isEmpty()) {
                 synchronized (lock) {
                     results.values = mDatasetAllItems;
                     results.count = mDatasetAllItems.size();
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java
index 78d73165..50430efd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java
@@ -49,9 +49,9 @@ public class DialogBasketLU_Page1_ViewModel extends DialogBasketLU_BaseViewModel
 
         ColliMagazzinoRESTConsumer.retrieveBasketColli(mtbColts -> {
             availableMtbColts = mtbColts;
-            if(mtbColts != null && mtbColts.size() > 0) initRecyclerView(availableMtbColts);
+            if(mtbColts != null && !mtbColts.isEmpty()) initRecyclerView(availableMtbColts);
 
-            mBinding.emptyView.setVisibility(mtbColts != null && mtbColts.size() > 0 ? View.GONE : View.VISIBLE);
+            mBinding.emptyView.setVisibility(mtbColts != null && !mtbColts.isEmpty() ? View.GONE : View.VISIBLE);
         }, ex -> {
             mBinding.emptyView.setVisibility(View.VISIBLE);
         });
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java
index 1094644f..c4ecc31f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java
@@ -46,8 +46,8 @@ public class DialogBasketLU_Page2_ViewModel extends DialogBasketLU_BaseViewModel
 
     @Override
     public void onPreShow() {
-        if(mMtbColt != null && mMtbColt.getMtbColr() != null && mMtbColt.getMtbColr().size() > 0) initRecyclerView(mMtbColt.getMtbColr());
-        mBinding.emptyView.setVisibility(mMtbColt != null && mMtbColt.getMtbColr() != null && mMtbColt.getMtbColr().size() > 0 ? View.GONE : View.VISIBLE);
+        if(mMtbColt != null && mMtbColt.getMtbColr() != null && !mMtbColt.getMtbColr().isEmpty()) initRecyclerView(mMtbColt.getMtbColr());
+        mBinding.emptyView.setVisibility(mMtbColt != null && mMtbColt.getMtbColr() != null && !mMtbColt.getMtbColr().isEmpty() ? View.GONE : View.VISIBLE);
 
         mBinding.buttonAbort.setOnClickListener(v -> {
             previous();
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java
index e2bc9c39..1f241c6f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java
@@ -296,7 +296,7 @@ public class DialogChooseArtsFromMtbColrList extends BaseDialogFragment implemen
     private void loadArticolo(String barcodeProd, Ean128Model ean128Model) {
         this.articoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> {
 
-            if (mtbAartList != null && mtbAartList.size() > 0) {
+            if (mtbAartList != null && !mtbAartList.isEmpty()) {
                 MtbAart articolo = mtbAartList.get(0);
                 this.mBindings.mainSearch.setQuery(articolo.getCodMart(), false);
 
@@ -320,7 +320,7 @@ public class DialogChooseArtsFromMtbColrList extends BaseDialogFragment implemen
                         !x.isHidden())
                 .toList();
 
-        if (foundRowsList.size() == 0) {
+        if (foundRowsList.isEmpty()) {
             DialogCommon.showNoArtFoundDialog(mContext, null);
         } else {
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
index 7c265541..7a4b70b5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
@@ -347,8 +347,8 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI
 
 
         this.mViewModel.getLineeProd().observe(getViewLifecycleOwner(), lineeProd -> {
-            this.enabledLineeProd.set(lineeProd != null && lineeProd.size() > 0);
-            this.mViewModel.setLineeProdRequired(lineeProd != null && lineeProd.size() > 0);
+            this.enabledLineeProd.set(lineeProd != null && !lineeProd.isEmpty());
+            this.mViewModel.setLineeProdRequired(lineeProd != null && !lineeProd.isEmpty());
 
             lineeProdArrayAdapter = new DialogInputLULineeProdAdapter(getActivity(), R.layout.array_adapter_single_item, lineeProd);
             mBindings.filledExposedDropdownCodJfas.setAdapter(lineeProdArrayAdapter);
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java
index 964fb7b3..b196ffbb 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java
@@ -129,7 +129,7 @@ public class DialogScanArtViewModel {
     private void executeEtichettaLU(String SSCC, RunnableArgssss<DialogConsts.Results, MtbAart, Ean128Model, List<MtbColr>> onComplete) {
         mColliMagazzinoRESTConsumer.getBySSCC(SSCC, true, false, mtbColt -> {
 
-            if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+            if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
                 if (mtbColt.getSegno() != -1) {
                     onComplete.run(DialogConsts.Results.YES, null, null, mtbColt.getMtbColr());
                 } else this.sendError(new InvalidLUException());
@@ -164,7 +164,7 @@ public class DialogScanArtViewModel {
     private void executePosizione(MtbDepoPosizione posizione, MtbAart articolo, RunnableArgssss<DialogConsts.Results, MtbAart, Ean128Model, List<MtbColr>> onComplete) {
         this.mPosizioniRESTConsumer.getBancaliInPosizione(posizione, mtbColtList -> {
 
-            if (mtbColtList == null || mtbColtList.size() == 0) {
+            if (mtbColtList == null || mtbColtList.isEmpty()) {
                 this.sendError(new NoLUFoundException());
             } else if (mtbColtList.size() == 1) {
                 this.mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> {
@@ -180,7 +180,7 @@ public class DialogScanArtViewModel {
 
     private void loadArticolo(@NotNull String barcodeProd, Ean128Model ean128Model, RunnableArgssss<DialogConsts.Results, MtbAart, Ean128Model, List<MtbColr>> onComplete) {
         this.mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> {
-            if (mtbAartList != null && mtbAartList.size() > 0) {
+            if (mtbAartList != null && !mtbAartList.isEmpty()) {
 
                 MtbAart firstArt = mtbAartList.get(0);
                 MtbDepoPosizione firstArtPosition = UtilityPosizione.getFromCache(firstArt.getPosizione());
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
index 26a02de5..bf6b0700 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
@@ -95,7 +95,7 @@ public class DialogScanOrCreateLUViewModel {
     private void executePosizione(MtbDepoPosizione posizione, Runnable onComplete) {
         this.mPosizioniRESTConsumer.getBancaliInPosizione(posizione, mtbColtList -> {
 
-            if (mtbColtList == null || mtbColtList.size() == 0) {
+            if (mtbColtList == null || mtbColtList.isEmpty()) {
                 this.sendError(new NoLUFoundException());
             } else if (mtbColtList.size() == 1) {
                 this.mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), mShouldCheckResiduo, false, mtbColt -> {

From b5f7e12f5adde9394db94766902ae31ef4e1d828 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 4 Feb 2025 10:25:58 +0100
Subject: [PATCH 095/103] Fix post merge

---
 .../core/rest/consumers/ArticoloRESTConsumer.java           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
index 6a0b3e03..b4f819f0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
@@ -105,7 +105,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
         articoloRESTConsumerService
                 .findIfIsKit(mtbAart)
-                .enqueue(new Callback<>() {
+                .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(@NonNull Call<ServiceRESTResponse<MtbAart>> call, @NonNull Response<ServiceRESTResponse<MtbAart>> response) {
                         analyzeAnswer(response, "findIfIsKit", (m) -> {
@@ -114,8 +114,8 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
                     }
 
                     @Override
-                    public void onFailure(@NonNull Call<ServiceRESTResponse<MtbAart>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
+                    public void onFailure(Call<ServiceRESTResponse<MtbAart>> call, @NonNull Exception e) {
+                        onFailed.run(e);
                     }
                 });
     }

From 13ec0c745eadd6c6a35505d32c7680c1c785f749 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 4 Feb 2025 11:50:19 +0100
Subject: [PATCH 096/103] Creato nuovo dialog per notificare gli aggiornamenti
 dell'app

---
 app/build.gradle                              |  3 -
 .../MainApplicationComponent.java             |  7 +-
 .../core/update/UpdatesManager.java           | 40 ++++----
 .../DialogUpdateAvailableComponent.java       | 14 +++
 .../DialogUpdateAvailableModule.java          | 14 +++
 .../DialogUpdateAvailableView.java            | 82 ++++++++++++++++
 .../DialogUpdateAvailableViewModel.java       | 19 ++++
 .../res/drawable/ic_baseline_warning_24.xml   |  8 +-
 .../main/res/drawable/ic_cloud_download.xml   |  5 +
 .../res/layout/dialog_update_available.xml    | 93 +++++++++++++++++++
 app/src/main/res/values-it/strings.xml        |  5 +
 app/src/main/res/values/custom_colors.xml     |  1 +
 app/src/main/res/values/strings.xml           |  4 +
 13 files changed, 270 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableComponent.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableModule.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableView.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableViewModel.java
 create mode 100644 app/src/main/res/drawable/ic_cloud_download.xml
 create mode 100644 app/src/main/res/layout/dialog_update_available.xml

diff --git a/app/build.gradle b/app/build.gradle
index 5817e59e..d14c9cbf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -164,9 +164,6 @@ dependencies {
     annotationProcessor "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-rxjava3:$room_version"
 
-    //AppUpdate
-    implementation 'com.github.javiersantos:AppUpdater:2.7'
-
     //Barcode
     implementation project(':pointmobilescannerlibrary')
     implementation project(':zebrascannerlibrary')
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
index 07e82282..0fc058e3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
@@ -150,6 +150,8 @@ import it.integry.integrywmsnative.view.dialogs.switch_user_depo.DialogSwitchUse
 import it.integry.integrywmsnative.view.dialogs.switch_user_depo.DialogSwitchUserDepoModule;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiComponent;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiModule;
+import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAvailableComponent;
+import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAvailableModule;
 
 // Definition of the Application graph
 @Singleton
@@ -227,7 +229,8 @@ import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracc
         DialogAskVettoreModule.class,
         DialogAskVettoreModule.class,
         DialogCreateNewArtModule.class,
-        DialogSwitchUserDepoModule.class
+        DialogSwitchUserDepoModule.class,
+        DialogUpdateAvailableModule.class
 })
 public interface MainApplicationComponent {
 
@@ -382,6 +385,8 @@ public interface MainApplicationComponent {
 
     ProdRientroMerceOrderListComponent.Factory prodRientroMerceOrderListComponent();
 
+    DialogUpdateAvailableComponent.Factory dialogUpdateAvailableComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java
index a8703dbf..f09379f8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java
@@ -7,19 +7,17 @@ import android.os.Environment;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.github.javiersantos.appupdater.AppUpdater;
-import com.github.javiersantos.appupdater.enums.Display;
-import com.github.javiersantos.appupdater.enums.UpdateFrom;
-
 import java.io.File;
 
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.FileDownloader;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
+import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAvailableView;
 
 @Singleton
 public class UpdatesManager {
@@ -39,25 +37,33 @@ public class UpdatesManager {
 
         systemRESTConsumer.retrieveUpdatesInfo(latestData -> {
 
-            if(latestData == null)
+            if (latestData == null)
                 return;
 
-            AppUpdater appUpdater = new AppUpdater(mContext)
-                    .setDisplay(Display.DIALOG)
-                    .setUpdateFrom(UpdateFrom.JSON)
-                    .setUpdateJSON(currentVersionUrl)
-                    .setButtonDoNotShowAgain(null)
-                    .setButtonUpdateClickListener((dialog, which) -> {
-                        installAPK(currentDownloadUrl);
-                    });
+            showDialog(latestData, () -> {
+                installAPK(currentDownloadUrl);
+            });
 
-            if(latestData.isForced())
-                appUpdater.setButtonDismiss(null);
-
-            appUpdater.start();
+//            AppUpdater appUpdater = new AppUpdater(mContext)
+//                    .setDisplay(Display.DIALOG)
+//                    .setUpdateFrom(UpdateFrom.JSON)
+//                    .setUpdateJSON(currentVersionUrl)
+//                    .setButtonDoNotShowAgain(null)
+//                    .setButtonUpdateClickListener((dialog, which) -> {
+//                        installAPK(currentDownloadUrl);
+//                    });
+//
+//            if (latestData.isForced())
+//                appUpdater.setButtonDismiss(null);
+//
+//            appUpdater.start();
         }, ex -> UtilityExceptions.defaultException(mContext, ex));
     }
 
+    private void showDialog(LatestAppVersionInfoDTO updatesData, Runnable onUpdateStart) {
+        DialogUpdateAvailableView.newInstance(updatesData, onUpdateStart)
+                .show(mContext.getSupportFragmentManager(), "dialog-updates");
+    }
 
     private void installAPK(String downloadURL) {
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableComponent.java
new file mode 100644
index 00000000..49c2b7b1
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.update_available;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogUpdateAvailableComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogUpdateAvailableComponent create();
+    }
+
+    void inject(DialogUpdateAvailableView dialogUpdateAvailableView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableModule.java
new file mode 100644
index 00000000..8ca9ef55
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.update_available;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogUpdateAvailableComponent.class)
+public class DialogUpdateAvailableModule {
+
+    @Provides
+    DialogUpdateAvailableViewModel providesDialogUpdateAvailableViewModel() {
+        return new DialogUpdateAvailableViewModel();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableView.java
new file mode 100644
index 00000000..4747bed5
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableView.java
@@ -0,0 +1,82 @@
+package it.integry.integrywmsnative.view.dialogs.update_available;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
+import it.integry.integrywmsnative.databinding.DialogUpdateAvailableBinding;
+
+public class DialogUpdateAvailableView extends BaseDialogFragment {
+
+    @Inject
+    DialogUpdateAvailableViewModel mViewModel;
+
+    private DialogUpdateAvailableBinding mBindings;
+    private Context mContext;
+
+    private Runnable onStartUpdate;
+
+    //Pass here all external parameters
+    public static DialogUpdateAvailableView newInstance(LatestAppVersionInfoDTO updatesData, Runnable onStartUpdate) {
+        return new DialogUpdateAvailableView(updatesData, onStartUpdate);
+    }
+
+    private DialogUpdateAvailableView(LatestAppVersionInfoDTO updatesData, Runnable onStartUpdate) {
+        super();
+        this.onStartUpdate = onStartUpdate;
+
+        MainApplication.appComponent
+                .dialogUpdateAvailableComponent()
+                .create()
+                .inject(this);
+
+        mViewModel.init(updatesData);
+    }
+
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogUpdateAvailableBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+        mBindings.setViewmodel(mViewModel);
+
+
+        setCancelable(!mViewModel.getUpdatesData().get().isForced());
+
+        var alertDialogBuilder = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .setPositiveButton(R.string.update_action, (dialog, which) -> {
+                    this.dismiss();
+                    this.onStartUpdate.run();
+                });
+
+        if(!mViewModel.getUpdatesData().get().isForced()) {
+            alertDialogBuilder.setNegativeButton(R.string.abort, (dialog, which) -> {
+                this.dismiss();
+            });
+        }
+
+        var alertDialog = alertDialogBuilder.create();
+
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+        return alertDialog;
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableViewModel.java
new file mode 100644
index 00000000..6cf1b2c5
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/update_available/DialogUpdateAvailableViewModel.java
@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.view.dialogs.update_available;
+
+import androidx.databinding.ObservableField;
+
+import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
+
+public class DialogUpdateAvailableViewModel {
+
+    private ObservableField<LatestAppVersionInfoDTO> updatesData = new ObservableField<>();
+
+    public void init(LatestAppVersionInfoDTO updatesData) {
+        this.updatesData.set(updatesData);
+
+    }
+
+    public ObservableField<LatestAppVersionInfoDTO> getUpdatesData() {
+        return updatesData;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_warning_24.xml b/app/src/main/res/drawable/ic_baseline_warning_24.xml
index b1726a36..fe4d94db 100644
--- a/app/src/main/res/drawable/ic_baseline_warning_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_warning_24.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="#FF000000" android:pathData="M23.08,15.33L15,2.57c-0.68,-0.98 -1.81,-1.57 -3,-1.57s-2.32,0.58 -3.03,1.6L0.93,15.31c-1.02,1.46 -1.21,3.21 -0.5,4.56 0.7,1.35 2.17,2.12 4.01,2.12h15.12c1.85,0 3.31,-0.77 4.01,-2.12 0.7,-1.35 0.51,-3.09 -0.49,-4.54ZM11,7c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v6c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1L11,7ZM12,19c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5Z"/>
+    
 </vector>
diff --git a/app/src/main/res/drawable/ic_cloud_download.xml b/app/src/main/res/drawable/ic_cloud_download.xml
new file mode 100644
index 00000000..b33364b2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cloud_download.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="#FF000000" android:pathData="M17.974,7.146c-0.332,-0.066 -0.603,-0.273 -0.742,-0.569 -1.552,-3.271 -5.143,-5.1 -8.735,-4.438 -3.272,0.6 -5.837,3.212 -6.384,6.501 -0.162,0.971 -0.15,1.943 0.033,2.89 0.06,0.309 -0.073,0.653 -0.346,0.901 -1.145,1.041 -1.801,2.524 -1.801,4.07 0,3.032 2.467,5.5 5.5,5.5h11c4.136,0 7.5,-3.364 7.5,-7.5 0,-3.565 -2.534,-6.658 -6.026,-7.354ZM15.121,14.708l-2.707,2.707c-0.387,0.387 -0.896,0.582 -1.405,0.584l-0.009,0.002 -0.009,-0.002c-0.509,-0.002 -1.018,-0.197 -1.405,-0.584l-2.707,-2.707c-0.391,-0.391 -0.391,-1.023 0,-1.414s1.023,-0.391 1.414,0l1.707,1.707v-5c0,-0.553 0.448,-1 1,-1s1,0.447 1,1v5l1.707,-1.707c0.391,-0.391 1.023,-0.391 1.414,0s0.391,1.023 0,1.414Z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/dialog_update_available.xml b/app/src/main/res/layout/dialog_update_available.xml
new file mode 100644
index 00000000..556cbfd4
--- /dev/null
+++ b/app/src/main/res/layout/dialog_update_available.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="it.integry.integrywmsnative.R" />
+        <import type="androidx.core.content.ContextCompat" />
+        <import type="android.text.Html" />
+
+        <variable
+            name="viewmodel"
+            type="it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAvailableViewModel" />
+    </data>
+
+    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="0dp">
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="16dp"
+            android:paddingVertical="16dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_cloud_download"
+                app:tint="?colorPrimary" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title_text"
+                style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:maxLines="2"
+                android:text="@string/update_available" />
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                app:visibility="@{viewmodel.updatesData.forced}">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/ic_baseline_warning_24"
+                    android:tint="@color/colorWarning"
+                    android:layout_marginEnd="6dp"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/TextAppearance.Material3.BodyMedium"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/mandatory_update"
+                    android:textStyle="bold" />
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/ic_baseline_warning_24"
+                    android:tint="@color/colorWarning"
+                    android:layout_marginStart="6dp" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/description_text"
+                style="@style/TextAppearance.Material3.BodyMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_marginTop="12dp"
+                tools:text="@string/update_description"
+                android:text="@{Html.fromHtml(String.format(ContextCompat.getString(context, R.string.update_description), viewmodel.updatesData.latestVersion))}" />
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+    </androidx.cardview.widget.CardView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0b70fac6..d2a7e179 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -5,6 +5,11 @@
     <string name="navigation_drawer_open">Apri menu</string>
     <string name="navigation_drawer_close">Chiudi menu</string>
 
+    <string name="update_action">Aggiorna</string>
+    <string name="update_available">Aggiornamento disponibile</string>
+    <string name="mandatory_update">Obbligatorio</string>
+    <string name="update_description"><![CDATA[L\'aggiornamento <b>%s</b> è disponibile al download. Scaricando l\'ultimo aggiornamento avrai le ultime funzionalità, migliorie e bug fix.]]></string>
+
     <string name="waiting">Attendere</string>
     <string name="loading">Caricamento</string>
     <string name="completed">Completato</string>
diff --git a/app/src/main/res/values/custom_colors.xml b/app/src/main/res/values/custom_colors.xml
index 77a8b4a3..7c03f040 100644
--- a/app/src/main/res/values/custom_colors.xml
+++ b/app/src/main/res/values/custom_colors.xml
@@ -7,6 +7,7 @@
     <color name="colorAccent">#387ef5</color>
     <color name="colorRipple">#3f3f51b5</color>
     <color name="colorPrimaryGray">#757575</color>
+    <color name="colorWarning">#EED202</color>
 
     <color name="mainGreen">@color/green_500</color>
     <color name="mainOrange">@color/orange_700</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a9d77758..79e3a5bb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,6 +50,10 @@
 
     <string name="action_settings">Settings</string>
 
+    <string name="update_action">Update</string>
+    <string name="update_available">Update available</string>
+    <string name="mandatory_update">Mandatory</string>
+    <string name="update_description"><![CDATA[Update <b>%s</b> is available for download. Downloading the latest update will give you the latest features, improvements and bug fixes.]]></string>
 
     <string name="action_customize_server_settings">Custom company settings</string>
     <string name="waiting">Waiting</string>

From bce8f2a8b774c6752573692b4461dd8255261dd5 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 5 Feb 2025 12:59:35 +0100
Subject: [PATCH 097/103] =?UTF-8?q?Fix=20visibilit=C3=A0=20posizione=20in?=
 =?UTF-8?q?=20rettifica=20giacenze?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../it/integry/integrywmsnative/core/di/Converters.java   | 6 ++++++
 .../main/res/layout/fragment_main_rettifica_giacenze.xml  | 8 ++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
index dbadd7a5..23dcca26 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
@@ -838,6 +838,12 @@ public class Converters {
     }
 
 
+    @BindingAdapter("visibilityWhenNotNull")
+    public static void bindViewVisibilityWhenNotNull(View view, Object genericObject) {
+        view.setVisibility(genericObject == null ? View.GONE : View.VISIBLE);
+    }
+
+
     @BindingAdapter("visibilityWhenNull")
     public static void bindViewVisibilityWhenNull(View view, ObservableField<?> bindableObject) {
 
diff --git a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
index a500d7ce..465a1fa7 100644
--- a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
+++ b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
@@ -6,15 +6,10 @@
     <data>
 
         <import type="it.integry.integrywmsnative.R" />
-
         <import type="android.text.Html" />
-
         <import type="androidx.databinding.ObservableList" />
-
         <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
-
         <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
-
         <import type="android.view.View" />
 
         <variable
@@ -77,7 +72,8 @@
                             <androidx.appcompat.widget.LinearLayoutCompat
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:orientation="horizontal">
+                                android:orientation="horizontal"
+                                app:visibilityWhenNotNull="@{view.currentMtbColtObs.posizione}">
 
                                 <androidx.appcompat.widget.AppCompatTextView
                                     style="@style/AppTheme.NewMaterial.Text.Medium"

From dc38311125c0e59b3abf7687ebb58ee52ead6e49 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 6 Feb 2025 15:11:21 +0100
Subject: [PATCH 098/103] Sostituito FBToast con snackbar nativo. Rimosse
 librerie inutilizzate.

---
 app/build.gradle                              |   5 +-
 .../BindingRecyclerViewAdapter.java           |   9 +-
 .../core/ean128/Ean128Service.java            |   6 +-
 .../core/expansion/BaseDialog.java            |   4 -
 .../core/model/FiltroOrdineDTO.java           |   2 -
 .../core/model/StbGestSetup.java              |   2 -
 .../integrywmsnative/core/model/VtbVetr.java  |   2 -
 .../DocumentiRESTConsumerService.java         |   1 -
 .../GiacenzaRESTConsumerService.java          |   2 -
 .../deserializer/LocalDateDeserializer.java   |   1 -
 .../serializer/StatoPartitaMagSerializer.java |   2 -
 .../core/sound/SoundAlertService.java         |   4 +-
 .../core/utility/UtilityFAB.java              |   4 +-
 .../core/utility/UtilityToast.java            |   2 -
 .../AccettazioneBollaPickingActivity.java     |  11 +-
 ...cettazioneBollaPickingFilterViewModel.java |   1 -
 .../AccettazioneBollaPickingListAdapter.java  |   3 -
 .../AccettazioneOrdiniPickingActivity.java    |  10 +-
 .../AccettazioneOrdiniPickingListModel.java   |   1 -
 .../ArticoliInGiacenzaModule.java             |   1 -
 .../DocInterniViewModel.java                  |   2 -
 .../edit_form/ui/DocumentRowsListAdapter.java |   4 -
 .../rest/DocInterniRESTConsumerService.java   |   1 -
 .../ui/DocInterniListAdapter.java             |   2 -
 .../ui/DocInterniListModel.java               |   1 -
 .../picking_libero/PickingLiberoFragment.java |  10 +-
 .../picking_resi/PickingResiActivity.java     |  11 +-
 ...abbisognoLineeProdRESTConsumerService.java |   2 -
 .../ProdRiposizionamentoDaProdFragment.java   |   1 -
 .../ProdRiposizionamentoDaProdModule.java     |   2 -
 .../RettificaGiacenzeFragment.java            |   6 +-
 .../gest/spedizione/SpedizioneActivity.java   |   9 +-
 .../spedizione/model/PickedQuantityDTO.java   |   1 -
 ...ogUltimiArriviFornitoreFiltroAvanzato.java |   4 -
 .../ui/CheckBoxThreeStates.java               |   3 -
 .../integrywmsnative/ui/StatusBarAlert.java   | 368 ------------------
 .../DialogAskCliente_Page1ViewModel.java      |   8 +-
 .../DialogAskPositionOfLUAdapter.java         |   8 +-
 .../dialogs/exception/DialogException.java    |   1 -
 .../input_peso_lu/DialogInputPesoLUView.java  |   2 -
 .../DialogInputQuantityV2View.java            |   6 +-
 .../DialogInputQuantityV2ViewModel.java       |   3 -
 .../activity_pv_ordine_acquisto_edit.xml      |   2 +-
 ...prod_fabbisogno_linee_list_single_item.xml |   3 +-
 .../layout/fragment_pv_ordini_acquisto.xml    |   2 +-
 app/src/main/res/values/custom_colors.xml     |   2 +
 gradle.properties                             |   2 +-
 47 files changed, 71 insertions(+), 468 deletions(-)
 delete mode 100644 app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java

diff --git a/app/build.gradle b/app/build.gradle
index d14c9cbf..0f80e1a5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -150,10 +150,7 @@ dependencies {
     //FAB
     implementation 'com.github.clans:fab:1.6.4'
     //CUSTOM VIEWS
-    implementation 'com.github.NaimishTrivedi:FBToast:1.0'
     implementation 'com.github.cachapa:ExpandableLayout:2.9.2'
-    implementation 'com.github.frankiesardo:linearlistview:1.0.1@aar'
-    implementation 'com.github.fede87:StatusBarAlert:1.0.1'
     implementation 'com.github.zhukic:sectioned-recyclerview:1.2.3'
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
@@ -181,7 +178,7 @@ dependencies {
 
 
     //Bluetooth device manager
-    implementation 'com.github.harry1453:android-bluetooth-serial:v1.1'
+    implementation 'com.github.harry1453:android-bluetooth-serial:v1.1.2'
 
     // RxJava is also required.
     implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java
index 78996906..3c22110b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java
@@ -1,14 +1,15 @@
 package it.integry.integrywmsnative.core.di.binders.recyclerview;
 
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
 import androidx.databinding.ViewDataBinding;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 
 import java.lang.ref.WeakReference;
 import java.util.Collection;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java b/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java
index cf88f57b..c5405de0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java
@@ -66,19 +66,19 @@ public class Ean128Service {
 
                     switch (aiModel.AI) {
                         case SSCC -> {
-                            if (!aiValue.isEmpty() && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
+                            if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
                                 aiValue = new StringBuilder(aiValue.substring(1));
                             }
                             model.Sscc = aiValue.toString();
                         }
                         case GTIN -> {
-                            if (!aiValue.isEmpty() && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
+                            if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
                                 aiValue = new StringBuilder(aiValue.substring(1));
                             }
                             model.Gtin = aiValue.toString();
                         }
                         case CONTENT -> {
-                            if (!aiValue.isEmpty() && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
+                            if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
                                 aiValue = new StringBuilder(aiValue.substring(1));
                             }
                             model.Content = aiValue.toString();
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java
index 593338a8..f1473f04 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java
@@ -2,15 +2,11 @@ package it.integry.integrywmsnative.core.expansion;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.view.KeyEvent;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
-import it.integry.pointmobilescannerlibrary.PointMobileBarcodeReader;
 
 public class BaseDialog extends Dialog {
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java
index 30d23566..fe52267e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java
@@ -1,7 +1,5 @@
 package it.integry.integrywmsnative.core.model;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import it.integry.integrywmsnative.core.utility.UtilityDate;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java b/app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java
index 4ead3ea1..9308d93c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java
@@ -1,7 +1,5 @@
 package it.integry.integrywmsnative.core.model;
 
-import java.util.Date;
-
 public class StbGestSetup extends EntityBase{
 
     private String gestName;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVetr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVetr.java
index 026ee993..ef893ff0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVetr.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVetr.java
@@ -1,7 +1,5 @@
 package it.integry.integrywmsnative.core.model;
 
-import android.os.Parcelable;
-
 import java.math.BigDecimal;
 
 public class VtbVetr extends EntityBase {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java
index 615efda1..64890b44 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java
@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.DtbDoct;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumerService.java
index 1a0705f9..cad38fd0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumerService.java
@@ -2,9 +2,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import java.util.List;
 
-import it.integry.integrywmsnative.core.model.DtbDoct;
 import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
-import it.integry.integrywmsnative.core.rest.model.LoadColliDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.giacenza.InstantItemSituationResponseDto;
 import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto.ArtsInGiacenzaDTO;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java
index fdd81603..3c71d603 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java
@@ -9,7 +9,6 @@ import java.lang.reflect.Type;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 
 public class LocalDateDeserializer implements JsonDeserializer<LocalDate> {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/StatoPartitaMagSerializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/StatoPartitaMagSerializer.java
index 21e3c210..523714a5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/StatoPartitaMagSerializer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/StatoPartitaMagSerializer.java
@@ -6,10 +6,8 @@ import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
 import java.lang.reflect.Type;
-import java.time.LocalDateTime;
 
 import it.integry.integrywmsnative.core.model.secondary.StatoPartitaMag;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 public class StatoPartitaMagSerializer implements JsonSerializer<StatoPartitaMag> {
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/sound/SoundAlertService.java b/app/src/main/java/it/integry/integrywmsnative/core/sound/SoundAlertService.java
index 04cb10d8..ac94e315 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/sound/SoundAlertService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/sound/SoundAlertService.java
@@ -3,11 +3,11 @@ package it.integry.integrywmsnative.core.sound;
 import android.content.Context;
 import android.media.MediaPlayer;
 
-import it.integry.integrywmsnative.R;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import it.integry.integrywmsnative.R;
+
 @Singleton
 public class SoundAlertService {
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFAB.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFAB.java
index ca48ffd7..462aaf0e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFAB.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFAB.java
@@ -1,10 +1,10 @@
 package it.integry.integrywmsnative.core.utility;
 
 import android.content.Context;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
 import android.view.animation.AnimationUtils;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 import it.integry.integrywmsnative.R;
 
 /**
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityToast.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityToast.java
index 785dbebd..f2418f2c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityToast.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityToast.java
@@ -3,8 +3,6 @@ package it.integry.integrywmsnative.core.utility;
 import android.content.Context;
 import android.widget.Toast;
 
-import it.integry.integrywmsnative.MainApplication;
-
 public class UtilityToast {
 
     private static Context context;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
index e61ca249..4d222ef8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
@@ -16,7 +16,7 @@ import androidx.preference.PreferenceManager;
 
 import com.annimon.stream.ComparatorCompat;
 import com.annimon.stream.Stream;
-import com.tfb.fbtoast.FBToast;
+import com.google.android.material.snackbar.Snackbar;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -487,7 +487,10 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
     public void onLUOpened(MtbColt mtbColt) {
         runOnUiThread(() -> {
             noLUPresent.set(false);
-            FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+
+            Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
+                    .setBackgroundTint(getResources().getColor(R.color.colorSuccess))
+                    .show();
 
             this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt);
         });
@@ -506,7 +509,9 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
     @Override
     public void onRowSaved() {
         runOnUiThread(() -> {
-            FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+            Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
+                    .setBackgroundTint(getResources().getColor(R.color.colorSuccess))
+                    .show();
         });
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java
index 6280da7f..52058612 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java
@@ -9,7 +9,6 @@ import com.annimon.stream.function.Predicate;
 import java.util.List;
 import java.util.Objects;
 
-import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.PickingObjectDTO;
 
 public class AccettazioneBollaPickingFilterViewModel {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
index 8ef41338..594cc38b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
@@ -18,10 +18,7 @@ import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
index b6ec5a0b..e8c9e98b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
@@ -18,7 +18,7 @@ import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.Stream;
-import com.tfb.fbtoast.FBToast;
+import com.google.android.material.snackbar.Snackbar;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -780,7 +780,9 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     @Override
     public void onRowSaved() {
         runOnUiThread(() -> {
-            FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+            Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
+                    .setBackgroundTint(getResources().getColor(R. color. green_500))
+                    .show();
         });
     }
 
@@ -825,7 +827,9 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     public void onLUOpened(MtbColt mtbColt) {
         runOnUiThread(() -> {
             noLUPresent.set(false);
-            FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+            Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
+                    .setBackgroundTint(getResources().getColor(R. color. green_500))
+                    .show();
 
             this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt);
         });
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListModel.java
index 1209eef2..0d1aacc7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListModel.java
@@ -3,7 +3,6 @@ package it.integry.integrywmsnative.gest.accettazione_ordini_picking.ui;
 import org.jetbrains.annotations.NotNull;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 import it.integry.integrywmsnative.gest.accettazione_ordini_picking.dto.PickingObjectDTO;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaModule.java
index 50602367..3a3ab70c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaModule.java
@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.gest.articoli_in_giacenza;
 
 import dagger.Module;
 import dagger.Provides;
-import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
 import it.integry.integrywmsnative.core.services.inventario.InventarioService;
 
 @Module(subcomponents = ArticoliInGiacenzaComponent.class)
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
index 075a84af..6b8b416a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java
@@ -8,7 +8,6 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
 import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper;
@@ -19,7 +18,6 @@ import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.documento.DocumentoArtDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
-import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoResponseDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/ui/DocumentRowsListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/ui/DocumentRowsListAdapter.java
index ec51894a..98715f8a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/ui/DocumentRowsListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/ui/DocumentRowsListAdapter.java
@@ -1,7 +1,6 @@
 package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.ui;
 
 import android.content.Context;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
@@ -12,12 +11,9 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
-import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.view.ExtendedRecyclerView;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.ActivityContabDocInternoRowListSingleItemBinding;
-import it.integry.integrywmsnative.databinding.DocInterniListModelBinding;
 
 public class DocumentRowsListAdapter extends ExtendedRecyclerView<SqlMtbColr, DocumentRowsListAdapter.SingleItemViewHolder> {
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java
index 5c2798bd..fda0c079 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java
@@ -3,7 +3,6 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.rest;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.rest.model.documento.RetrieveDocumentoArtsResponseDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.RetrieveLottiDTO;
 import retrofit2.Call;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListAdapter.java
index d766051c..40dfa88a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListAdapter.java
@@ -6,14 +6,12 @@ import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.recyclerview.widget.RecyclerView;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
-import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.view.ExtendedRecyclerView;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListModel.java
index 6ab3fb40..8d8d148f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListModel.java
@@ -1,7 +1,6 @@
 package it.integry.integrywmsnative.gest.contab_doc_interni.ui;
 
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
-import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper;
 
 public class DocInterniListModel {
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
index 4af25784..0c36446b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
@@ -16,7 +16,7 @@ import androidx.databinding.ObservableList;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.tfb.fbtoast.FBToast;
+import com.google.android.material.snackbar.Snackbar;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -256,7 +256,9 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
                 }
             });
 
-            FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+            Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
+                    .setBackgroundTint(getResources().getColor(R. color. green_500))
+                    .show();
         });
     }
 
@@ -381,7 +383,9 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
     @Override
     public void onRowSaved() {
         requireActivity().runOnUiThread(() -> {
-            FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+            Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
+                    .setBackgroundTint(getResources().getColor(R. color. green_500))
+                    .show();
         });
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
index 186e2915..ed13e91d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
@@ -11,7 +11,7 @@ import androidx.databinding.ObservableArrayList;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.Stream;
-import com.tfb.fbtoast.FBToast;
+import com.google.android.material.snackbar.Snackbar;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -363,7 +363,9 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
 
     @Override
     public void onRowSaved() {
-        FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+        Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
+                .setBackgroundTint(getResources().getColor(R. color. green_500))
+                .show();
     }
 
     @Override
@@ -379,7 +381,10 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
     @Override
     public void onLUOpened(MtbColt mtbColt) {
         noLUPresent.set(false);
-        FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+
+        Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
+                .setBackgroundTint(getResources().getColor(R. color. green_500))
+                .show();
 
         this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt);
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java
index 49645361..76d1a0ad 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java
@@ -1,11 +1,9 @@
 package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest;
 
-import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
-import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdFragment.java
index 28bf7210..6c6c50ef 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdFragment.java
@@ -33,7 +33,6 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.ISearchableFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
-import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.databinding.FragmentProdRiposizionamentoDaProdBinding;
 import it.integry.integrywmsnative.databinding.ProdRiposizionamentoDaProdListItemBinding;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdModule.java
index 754a1168..abd21adb 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdModule.java
@@ -5,8 +5,6 @@ import dagger.Provides;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.sound.SoundAlertService;
 
 @Module(subcomponents = ProdRiposizionamentoDaProdComponent.class)
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java
index 51f1c221..4c467954 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java
@@ -18,8 +18,8 @@ import androidx.core.content.ContextCompat;
 import androidx.databinding.ObservableField;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.textfield.TextInputLayout;
-import com.tfb.fbtoast.FBToast;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -455,7 +455,9 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
     @Override
     public void onRowSaved() {
-        FBToast.successToast(requireActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+        Snackbar.make(getView(), R.string.data_saved, Snackbar.LENGTH_SHORT)
+                .setBackgroundTint(getResources().getColor(R. color. green_500))
+                .show();
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index ed0306d6..534b0086 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -18,7 +18,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.Stream;
 import com.google.android.material.snackbar.Snackbar;
-import com.tfb.fbtoast.FBToast;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -789,7 +788,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         this.addExtraItemsEnabled.set(SettingsManager.iDB().isFlagCanAddExtraItemSpedizione());
         noLUPresent.set(false);
 
-        FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+        Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
+                .setBackgroundTint(getResources().getColor(R. color. green_500))
+                .show();
 
         this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt);
     }
@@ -1055,7 +1056,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onRowSaved() {
-        FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+        Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
+                .setBackgroundTint(getResources().getColor(R. color. green_500))
+                .show();
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PickedQuantityDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PickedQuantityDTO.java
index 833e4d6e..d41e3ed6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PickedQuantityDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PickedQuantityDTO.java
@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.gest.spedizione.model;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.Date;
 
 public class PickedQuantityDTO {
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/dialog/DialogUltimiArriviFornitoreFiltroAvanzato.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/dialog/DialogUltimiArriviFornitoreFiltroAvanzato.java
index 55756808..824079d7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/dialog/DialogUltimiArriviFornitoreFiltroAvanzato.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/dialog/DialogUltimiArriviFornitoreFiltroAvanzato.java
@@ -22,14 +22,10 @@ import java.util.List;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.di.BindableString;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.GtbAnag;
-import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityString;
-import it.integry.integrywmsnative.databinding.DialogUltimeConsegneFiltroAvanzatoBinding;
 import it.integry.integrywmsnative.databinding.DialogUltimiArriviFornitoreFiltroAvanzatoBinding;
-import it.integry.integrywmsnative.gest.ultime_consegne_cliente.dialog.DialogUltimeConsegneFiltroAvanzato;
 
 public class DialogUltimiArriviFornitoreFiltroAvanzato {
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/CheckBoxThreeStates.java b/app/src/main/java/it/integry/integrywmsnative/ui/CheckBoxThreeStates.java
index 62cf64fd..3a1a31d6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/ui/CheckBoxThreeStates.java
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/CheckBoxThreeStates.java
@@ -1,15 +1,12 @@
 package it.integry.integrywmsnative.ui;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.view.ViewDebug;
 
 import androidx.annotation.ArrayRes;
 import androidx.appcompat.widget.AppCompatCheckBox;
 
-import it.integry.integrywmsnative.R;
-
 public class CheckBoxThreeStates extends AppCompatCheckBox {
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java b/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java
deleted file mode 100644
index 60fb2a74..00000000
--- a/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java
+++ /dev/null
@@ -1,368 +0,0 @@
-package it.integry.integrywmsnative.ui;
-
-import android.animation.Animator;
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.PorterDuff;
-import android.os.Build;
-import androidx.core.content.ContextCompat;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewPropertyAnimator;
-import android.view.Window;
-import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.AccelerateInterpolator;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.fede987.statusbaralert.utils.ScreenUtils;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import kotlin.TypeCastException;
-import kotlin.jvm.internal.Intrinsics;
-
-public class StatusBarAlert {
-    
-        private static final Map allAlerts = (Map)(new LinkedHashMap());
-        private static int statusBarColorOringinal;
-        private static boolean hasOriginalStatusBarTranslucent;
-        public static final StatusBarAlert.Companion Companion = new StatusBarAlert.Companion();
-
-        
-        public static final class Builder {
-            private int text;
-            private String stringText;
-            private int alertColor;
-            private boolean showProgress;
-            private long duration;
-            private boolean autoHide;
-            private Activity context;
-
-            @Nullable
-            public final View build() {
-                return StatusBarAlert.Companion.addStatusBarTextAndProgress(this.context, this.text, this.stringText, this.alertColor, this.showProgress, this.autoHide, this.duration);
-            }
-
-            @NotNull
-            public final StatusBarAlert.Builder withAlertColor(int alertColor) {
-                this.alertColor = alertColor;
-                return this;
-            }
-
-            @NotNull
-            public final StatusBarAlert.Builder withText(int text) {
-                this.text = text;
-                return this;
-            }
-
-            @NotNull
-            public final StatusBarAlert.Builder withText(@NotNull String text) {
-                Intrinsics.checkParameterIsNotNull(text, "text");
-                this.stringText = text;
-                return this;
-            }
-
-            @NotNull
-            public final StatusBarAlert.Builder showProgress(boolean showProgress) {
-                this.showProgress = showProgress;
-                return this;
-            }
-
-            @NotNull
-            public final StatusBarAlert.Builder autoHide(boolean autoHide) {
-                this.autoHide = autoHide;
-                return this;
-            }
-
-            @NotNull
-            public final StatusBarAlert.Builder withDuration(long millis) {
-                this.duration = millis;
-                return this;
-            }
-
-            public Builder(@NotNull Activity context) {
-                super();
-                Intrinsics.checkParameterIsNotNull(context, "context");
-                this.context = context;
-                this.stringText = "";
-                this.duration = 2000L;
-                this.autoHide = true;
-            }
-        }
-
-        public static final class Companion {
-            @Nullable
-            public final View addStatusBarTextAndProgress(@NotNull final Activity any, @Nullable Integer text, @Nullable String stringText, int alertColor, boolean showProgress, boolean autoHide, long duration) {
-
-                this.hide(any, null);
-                Window var10000 = any.getWindow();
-
-                View var18 = var10000.getDecorView();
-                if (var18 == null) {
-                    throw new TypeCastException("null cannot be cast to non-null type android.view.ViewGroup");
-                } else {
-
-                    ViewGroup decor = (ViewGroup)var18;
-                    final LinearLayout statusBarAlert = new LinearLayout(any);
-                    statusBarAlert.setLayoutParams(new ViewGroup.LayoutParams(-1, ScreenUtils.Companion.getStatusBarHeight(any)));
-                    statusBarAlert.setGravity(1);
-
-                    if (alertColor > 0) {
-                        statusBarAlert.setBackgroundColor(ContextCompat.getColor(any, alertColor));
-                    }
-
-                    LinearLayout ll2;
-                    TextView t;
-                    CharSequence var19;
-                    label58: {
-                        ll2 = new LinearLayout(any);
-                        ll2.setOrientation(LinearLayout.HORIZONTAL);
-                        ll2.setGravity(16);
-                        ll2.setLayoutParams(new ViewGroup.LayoutParams(-2, ScreenUtils.Companion.getStatusBarHeight(any)));
-                        t = new TextView(any);
-                        t.setLayoutParams(new ViewGroup.LayoutParams(-2, ScreenUtils.Companion.getStatusBarHeight(any)));
-                        t.setTextSize(12.0F);
-                        t.setTextColor(-1);
-                        t.setGravity(17);
-                        if (text != null) {
-                            if (text == 0) {
-                                var19 = (Intrinsics.areEqual(stringText, "") ^ true ? "" + stringText + ' ' : "");
-                                break label58;
-                            }
-                        }
-
-                        StringBuilder var10001 = new StringBuilder();
-                        Resources var10002 = any.getResources();
-                        if (text == null) {
-                            Intrinsics.throwNpe();
-                        }
-
-                        var19 = var10001.append(var10002.getString(text)).append(" ").toString();
-                    }
-
-                    t.setText(var19);
-                    t.setIncludeFontPadding(false);
-                    ll2.addView(t);
-                    if (showProgress) {
-                        ProgressBar p = new ProgressBar(any);
-                        p.setIndeterminate(true);
-                        p.getIndeterminateDrawable().setColorFilter(-1, PorterDuff.Mode.SRC_IN);
-                        p.setLayoutParams(new ViewGroup.LayoutParams(ScreenUtils.Companion.convertDpToPixel(11.0F, any), ScreenUtils.Companion.convertDpToPixel(11.0F, (Context)any)));
-                        ll2.addView(p);
-                    }
-
-                    statusBarAlert.addView(ll2);
-                    var10000 = any.getWindow();
-                    Intrinsics.checkExpressionValueIsNotNull(var10000, "any.window");
-                    var18 = var10000.getDecorView();
-                    Intrinsics.checkExpressionValueIsNotNull(var18, "any.window.decorView");
-                    View decorView = var18.getRootView();
-                    Intrinsics.checkExpressionValueIsNotNull(decorView, "decorView");
-                    decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
-                    StatusBarAlert.hasOriginalStatusBarTranslucent = this.isTranslucentStatusBar(any);
-                    if (Build.VERSION.SDK_INT >= 21) {
-                        any.getWindow().clearFlags(67108864);
-                        var10000 = any.getWindow();
-                        Intrinsics.checkExpressionValueIsNotNull(var10000, "any.window");
-                        StatusBarAlert.statusBarColorOringinal = var10000.getStatusBarColor();
-                        var10000 = any.getWindow();
-                        Intrinsics.checkExpressionValueIsNotNull(var10000, "any.window");
-                        var10000.setStatusBarColor(0);
-                    }
-
-                    decor.addView(statusBarAlert);
-                    ll2.setTranslationY(-((float)ScreenUtils.Companion.convertDpToPixel(25.0F, any)));
-                    ViewPropertyAnimator var20 = ll2.animate();
-                    if (var20 == null) {
-                        Intrinsics.throwNpe();
-                    }
-
-                    var20.translationY(0.0F).setDuration(150L).setStartDelay(350L).setInterpolator((new AccelerateDecelerateInterpolator())).start();
-                    if (autoHide) {
-                        statusBarAlert.postDelayed((new Runnable() {
-                            public final void run() {
-                                if (!any.isFinishing() && statusBarAlert.getParent() != null) {
-                                    StatusBarAlert.Companion.hideInternal(any, statusBarAlert, null);
-                                }
-
-                                Map var10000 = StatusBarAlert.allAlerts;
-                                ComponentName var10001 = any.getComponentName();
-                                Intrinsics.checkExpressionValueIsNotNull(var10001, "any.componentName");
-                                var10000.remove(var10001.getClassName());
-                            }
-                        }), duration + (long)500);
-                    }
-
-                    Map var21 = StatusBarAlert.allAlerts;
-                    ComponentName var22 = any.getComponentName();
-                    Intrinsics.checkExpressionValueIsNotNull(var22, "any.componentName");
-                    if (var21.get(var22.getClassName()) == null) {
-                        Map var14 = StatusBarAlert.allAlerts;
-                        ComponentName var23 = any.getComponentName();
-                        Intrinsics.checkExpressionValueIsNotNull(var23, "any.componentName");
-                        String var24 = var23.getClassName();
-                        Intrinsics.checkExpressionValueIsNotNull(var24, "any.componentName.className");
-                        String var15 = var24;
-                        List var16 = new ArrayList();
-                        var14.put(var15, var16);
-                    }
-
-                    var21 = StatusBarAlert.allAlerts;
-                    var22 = any.getComponentName();
-                    Intrinsics.checkExpressionValueIsNotNull(var22, "any.componentName");
-                    List var25 = (List)var21.get(var22.getClassName());
-                    if (var25 != null) {
-                        var25.add(statusBarAlert);
-                    }
-
-                    return statusBarAlert;
-                }
-            }
-
-            public final void hide(@NotNull Activity any, @Nullable Runnable onHidden) {
-                Map var10000;
-                ComponentName var10001;
-                List var9;
-                label48: {
-                    var10000 = StatusBarAlert.allAlerts;
-                    var10001 = any.getComponentName();
-
-                    if (var10000.get(var10001.getClassName()) != null) {
-                        var10000 = StatusBarAlert.allAlerts;
-                        var10001 = any.getComponentName();
-
-                        var9 = (List)var10000.get(var10001.getClassName());
-                        if (var9 == null) {
-                            break label48;
-                        }
-
-                        if (!var9.isEmpty()) {
-                            break label48;
-                        }
-                    }
-
-                    if (onHidden != null) {
-                        onHidden.run();
-                    }
-
-                    return;
-                }
-
-                var10000 = StatusBarAlert.allAlerts;
-                var10001 = any.getComponentName();
-                var9 = (List)var10000.get(var10001.getClassName());
-                if (var9 != null) {
-                    Iterable $receiver$iv = var9;
-                    Iterator var4 = $receiver$iv.iterator();
-
-                    while(var4.hasNext()) {
-                        Object element$iv = var4.next();
-                        LinearLayout it = (LinearLayout)element$iv;
-                        StatusBarAlert.Companion.hideInternal(any, it, onHidden);
-                    }
-                }
-
-                var10000 = StatusBarAlert.allAlerts;
-                var10001 = any.getComponentName();
-                var9 = (List)var10000.get(var10001.getClassName());
-                if (var9 != null) {
-                    var9.clear();
-                }
-
-            }
-
-            private final void hideInternal(Activity any, final LinearLayout it, final Runnable onHidden) {
-                if (it.getParent() != null) {
-                    Window var10000 = any.getWindow();
-                    View var5 = var10000.getDecorView();
-                    var5 = var5.getRootView();
-                    var5.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-
-                    if (Build.VERSION.SDK_INT >= 21) {
-                        var10000 = any.getWindow();
-                        var10000.setStatusBarColor(StatusBarAlert.statusBarColorOringinal);
-                        if (StatusBarAlert.hasOriginalStatusBarTranslucent) {
-                            any.getWindow().addFlags(67108864);
-                        }
-                    }
-
-                    var10000 = any.getWindow();
-                    var5 = var10000.getDecorView();
-                    if (var5 == null) {
-                        throw new TypeCastException("null cannot be cast to non-null type android.view.ViewGroup");
-                    }
-
-                    final ViewGroup decor = (ViewGroup)var5;
-                    ViewPropertyAnimator var6 = it.animate();
-                    if (var6 != null) {
-                        var6 = var6.translationY(-((float)ScreenUtils.Companion.convertDpToPixel(25.0F, (Context)any)));
-                        if (var6 != null) {
-                            var6 = var6.setDuration(150L);
-                            if (var6 != null) {
-                                var6 = var6.setStartDelay(500L);
-                                if (var6 != null) {
-                                    var6 = var6.setInterpolator(new AccelerateInterpolator());
-                                    if (var6 != null) {
-                                        var6 = var6.setListener((new Animator.AnimatorListener() {
-                                            public void onAnimationRepeat(@Nullable Animator animation) {
-                                            }
-
-                                            public void onAnimationEnd(@Nullable Animator animation) {
-                                                decor.removeView((View)it);
-                                                Runnable var10000 = onHidden;
-                                                if (onHidden != null) {
-                                                    var10000.run();
-                                                }
-
-                                            }
-
-                                            public void onAnimationStart(@Nullable Animator animation) {
-                                            }
-
-                                            public void onAnimationCancel(@Nullable Animator animation) {
-                                            }
-                                        }));
-                                        if (var6 != null) {
-                                            var6.start();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-            }
-
-            private final boolean isTranslucentStatusBar(Context any) {
-                if (any == null) {
-                    throw new TypeCastException("null cannot be cast to non-null type android.app.Activity");
-                } else {
-                    Window w = ((Activity)any).getWindow();
-                    android.view.WindowManager.LayoutParams lp = w.getAttributes();
-                    int flags = lp.flags;
-                    if (Build.VERSION.SDK_INT >= 19) {
-                        return (flags & 67108864) == 67108864;
-                    } else {
-                        return false;
-                    }
-                }
-            }
-
-            private Companion() {
-            }
-
-        }
-    }
-    
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java
index 3e038d83..943e5464 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java
@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel;
 
 import android.content.Context;
 import android.widget.AutoCompleteTextView;
-import android.widget.Toast;
 
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
@@ -10,7 +9,6 @@ import androidx.databinding.ViewDataBinding;
 
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
-import com.tfb.fbtoast.FBToast;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -110,7 +108,11 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod
                 refreshCodJcoms(resultCodJcom);
                 mBinding.dropdownCommessa.setText(barcode);
             } else {
-                FBToast.errorToast(mContext, "Nessun risultato trovato", Toast.LENGTH_LONG);
+
+//                Snackbar.make(mContext, "Nessun risultato trovato", Snackbar.LENGTH_SHORT)
+//                        .setBackgroundTint(mContext.getResources().getColor(R.color.colorError))
+//                        .show();
+
                 mBinding.dropdownCliente.setText("");
                 mBinding.dropdownCommessa.setText("");
             }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUAdapter.java
index 939ad643..4f60b480 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUAdapter.java
@@ -1,19 +1,19 @@
 package it.integry.integrywmsnative.view.dialogs.ask_position_of_lu;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.viewpager.widget.PagerAdapter;
-import it.integry.integrywmsnative.ui.DeactivatableViewPager;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import it.integry.integrywmsnative.ui.DeactivatableViewPager;
+
 public class DialogAskPositionOfLUAdapter extends PagerAdapter {
     private Context mContext;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/exception/DialogException.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/exception/DialogException.java
index abcab3b3..e164bdb7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/exception/DialogException.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/exception/DialogException.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.view.LayoutInflater;
-import android.view.View;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.databinding.DataBindingUtil;
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java
index ebbeb88f..c82338ab 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java
@@ -9,7 +9,6 @@ import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.annimon.stream.Stream;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.math.BigDecimal;
@@ -28,7 +27,6 @@ import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.databinding.DialogInputPesoLuBinding;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
index 119cbaf9..fe40362f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
@@ -224,15 +224,15 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         switch (this.mDialogInputQuantityV2DTO.getStatoPartitaMag().getStatoArt()) {
             case IN_SCADENZA -> {
                 this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_baseline_warning_24);
-                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), com.tfb.fbtoast.R.color.warn_color)));
+                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.colorWarning)));
             }
             case SCADUTO -> {
                 this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_baseline_warning_24);
-                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), com.tfb.fbtoast.R.color.error_color)));
+                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.colorError)));
             }
             case NON_IN_SCADENZA -> {
                 this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_round_check_24);
-                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), com.tfb.fbtoast.R.color.success_color)));
+                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.colorSuccess)));
             }
         }
     }
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 dc2f3a77..340945da 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
@@ -4,13 +4,10 @@ import androidx.databinding.ObservableField;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 import java.util.Optional;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
diff --git a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
index ba60b704..30319a6b 100644
--- a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
+++ b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
@@ -213,7 +213,7 @@
                 fab:menu_animationDelayPerItem="50"
                 fab:menu_backgroundColor="@color/white_bg_alpha"
                 fab:menu_buttonSpacing="0dp"
-                fab:menu_colorNormal="@color/success_color"
+                fab:menu_colorNormal="@color/colorSuccess"
                 fab:menu_colorPressed="@color/green_400"
                 fab:menu_labels_colorNormal="@color/white"
                 fab:menu_labels_colorPressed="@color/white_pressed"
diff --git a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml
index c46922e9..ca819b22 100644
--- a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml
+++ b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml
@@ -115,8 +115,7 @@
                     android:text="@{item.getOrdineLavorazioneDTO().descrizioneProd}"
                     tools:text="BUCATINI P13,5EPA T.60623/24"
                     style="@style/AppTheme.NewMaterial.Text.Small"
-                    android:layout_below="@+id/descrizione"
-                    android:layout_toStartOf="@id/right_sub_descrizione"/>
+                    android:layout_below="@+id/descrizione"/>
 
             </RelativeLayout>
         </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/fragment_pv_ordini_acquisto.xml b/app/src/main/res/layout/fragment_pv_ordini_acquisto.xml
index 02c81a24..9d6686e4 100644
--- a/app/src/main/res/layout/fragment_pv_ordini_acquisto.xml
+++ b/app/src/main/res/layout/fragment_pv_ordini_acquisto.xml
@@ -240,7 +240,7 @@
             android:src="@drawable/fab_add"
             android:onClick="@{() -> viewmodel.createNewOrder()}"
             android:visibility="gone"
-            fab:fab_colorNormal="@color/success_color"
+            fab:fab_colorNormal="@color/colorSuccess"
             fab:fab_colorPressed="@color/green_500"
             fab:fab_colorRipple="#66FFFFFF" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/custom_colors.xml b/app/src/main/res/values/custom_colors.xml
index 7c03f040..72dab875 100644
--- a/app/src/main/res/values/custom_colors.xml
+++ b/app/src/main/res/values/custom_colors.xml
@@ -7,7 +7,9 @@
     <color name="colorAccent">#387ef5</color>
     <color name="colorRipple">#3f3f51b5</color>
     <color name="colorPrimaryGray">#757575</color>
+    <color name="colorSuccess">@color/green_500</color>
     <color name="colorWarning">#EED202</color>
+    <color name="colorError">#D92727</color>
 
     <color name="mainGreen">@color/green_500</color>
     <color name="mainOrange">@color/orange_700</color>
diff --git a/gradle.properties b/gradle.properties
index 743f49e2..d0ea058a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -33,5 +33,5 @@ org.gradle.parallel=true
 # Enable simple gradle caching
 org.gradle.caching=true
 #  Increase memory allotted to JVM
-org.gradle.jvmargs=-Xmx4096m
+org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC
 org.gradle.unsafe.configuration-cache=true
\ No newline at end of file

From fe3a9d84d522dc00bf61a475d74501116ddf8e2c Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 10 Feb 2025 16:52:55 +0100
Subject: [PATCH 099/103] Fix su DialogProgressView. Aggiunto barcodeUl nel
 caso venga battezzata un'etichetta anonima in DialogScanOrCreateLU.

---
 .../view/dialogs/DialogProgressView.java      | 38 +++++++++++++------
 .../DialogScanOrCreateLUViewModel.java        |  1 +
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
index 62f55422..51c664a9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
@@ -3,6 +3,8 @@ package it.integry.integrywmsnative.view.dialogs;
 import android.app.Dialog;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -28,6 +30,9 @@ public class DialogProgressView extends DialogFragment {
 
     private boolean progressOpened;
 
+    private final Handler handler = new Handler(Looper.getMainLooper());
+    private boolean isPending = false;
+
     public static DialogProgressView newInstance(String title, String subtitle, boolean indeterminate) {
         return new DialogProgressView(title, subtitle, indeterminate);
     }
@@ -50,8 +55,6 @@ public class DialogProgressView extends DialogFragment {
         mBindings.setTitle(UtilityString.isNullOrEmpty(title) ? requireContext().getString(R.string.loading) : title);
         if (!UtilityString.isNullOrEmpty(subtitle)) mBindings.setSubtitle(subtitle);
 
-        mBindings.progressBar.setIndeterminate(isIndeterminateProgress());
-        if (!isIndeterminateProgress()) mBindings.progressBar.setMax(100);
 
         var alertDialog = new MaterialAlertDialogBuilder(requireContext())
                 .setView(mBindings.getRoot())
@@ -64,18 +67,31 @@ public class DialogProgressView extends DialogFragment {
     }
 
     public void show(@NonNull FragmentManager manager) {
-        if (!progressOpened && !isAdded() && !isInLayout()) {
-            this.progressOpened = true;
-            super.show(manager, "loading-dialog");
-        }
+        if (isPending) return;
+
+        isPending = true;
+        handler.postDelayed(() -> {
+            try {
+                if (!manager.isDestroyed() && !isAdded()) {
+                    manager.executePendingTransactions();
+                    showNow(manager, "loading-dialog");
+
+                    mBindings.progressBar.setIndeterminate(isIndeterminateProgress());
+                    if (!isIndeterminateProgress()) mBindings.progressBar.setMax(100);
+                }
+            } finally {
+                isPending = false;
+            }
+        }, 50);
     }
 
-    @Override
+
     public void dismiss() {
-        if (isAdded() || isInLayout() || progressOpened) {
-            this.progressOpened = false;
-            super.dismissAllowingStateLoss();
-        }
+        handler.post(() -> {
+            if (isAdded()) {
+                dismissAllowingStateLoss();
+            }
+        });
     }
 
     public String getTitle() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
index bf6b0700..4565b539 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
@@ -124,6 +124,7 @@ public class DialogScanOrCreateLUViewModel {
                     }
 
                     var createUdcRequest = new CreateUDCRequestDTO()
+                            .setBarcodeUl(barcodeScanDTO.getStringValue())
                             .setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep())
                             .setNumCollo(customNumCollo)
                             .setSerCollo(CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE);

From 56d509b07b871594d07b6f272d26aa5a7a7e98ab Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Mon, 10 Feb 2025 17:24:30 +0100
Subject: [PATCH 100/103] =?UTF-8?q?In=20inputQuantity=20l'avviso=20partita?=
 =?UTF-8?q?=20inattiva=20non=20=C3=A8=20pi=C3=B9=20bloccante=20ma=20chiede?=
 =?UTF-8?q?=20di=20continuare?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DialogInputQuantityV2ViewModel.java           | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

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 340945da..a348c09f 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
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.view.dialogs.input_quantity_v2;
 
+import android.text.SpannableString;
+
 import androidx.databinding.ObservableField;
 
 import java.math.BigDecimal;
@@ -29,6 +31,7 @@ import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.exception.InactiveBatchLotException;
 import it.integry.integrywmsnative.view.dialogs.exception.InvalidBatchLotException;
 import it.integry.integrywmsnative.view.dialogs.exception.InvalidExpireDateException;
@@ -390,12 +393,12 @@ public class DialogInputQuantityV2ViewModel {
     public void setNewPartitaMag(String internalPartitaMag) {
         this.internalPartitaMag = internalPartitaMag;
 
-        if (mPartitaMagList != null && SettingsManager.iDB().isSuggestDataScad()){
+        if (mPartitaMagList != null && SettingsManager.iDB().isSuggestDataScad()) {
             Optional<MtbPartitaMag> partitaMag = mPartitaMagList.stream()
                     .filter(x -> x.getPartitaMag().equalsIgnoreCase(internalPartitaMag))
                     .findFirst();
 
-            if (partitaMag.isPresent()){
+            if (partitaMag.isPresent()) {
                 setNewDataScad(partitaMag.get().getDataScad());
             } else {
                 MtbAart localMtbAart = mtbAart.get();
@@ -569,9 +572,11 @@ public class DialogInputQuantityV2ViewModel {
             }
 
             if (this.statoArt == StatoPartitaMag.DISATTIVO) {
-                this.sendError(new InactiveBatchLotException(internalPartitaMag));
-                onValidated.run(false);
-                return;
+                boolean result = runWarningDialogSyncronized(String.format(UtilityResources.getString(R.string.batch_lot_not_enabled), internalPartitaMag));
+                if (!result) {
+                    onValidated.run(false);
+                    return;
+                }
             }
 
             if (this.shouldAskDataScad && UtilityString.isNullOrEmpty(internalPartitaMag)) {

From 0b777137d5ab648dcbb0a8ecff402351d6f4f25c Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 10 Feb 2025 18:24:50 +0100
Subject: [PATCH 101/103] Fix su DialogProgressView. Aggiunto barcodeUl nel
 caso venga battezzata un'etichetta fornitore in DialogScanOrCreateLU.

---
 .../view/dialogs/DialogProgressView.java                 | 4 ++--
 .../scan_or_create_lu/DialogScanOrCreateLUViewModel.java | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
index 51c664a9..ae0e2765 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
@@ -70,7 +70,7 @@ public class DialogProgressView extends DialogFragment {
         if (isPending) return;
 
         isPending = true;
-        handler.postDelayed(() -> {
+        handler.post(() -> {
             try {
                 if (!manager.isDestroyed() && !isAdded()) {
                     manager.executePendingTransactions();
@@ -82,7 +82,7 @@ public class DialogProgressView extends DialogFragment {
             } finally {
                 isPending = false;
             }
-        }, 50);
+        });
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
index 4565b539..f000ed28 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
@@ -178,7 +178,14 @@ public class DialogScanOrCreateLUViewModel {
                         }
 
                     } else {
-                        this.sendError(new NoLUFoundException());
+                        var createUdcRequest = new CreateUDCRequestDTO()
+                                .setBarcodeUl(barcodeScanDTO.getStringValue())
+                                .setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep());
+
+                        this.mColliLavorazioneRESTConsumer.createUDC(createUdcRequest, createdMtbColt -> {
+                            onComplete.run();
+                            this.sendOnLUOpened(createdMtbColt, true);
+                        }, this::sendError);
                     }
 
                 }, this::sendError);

From ca545e2d448543c80174c7949d2eb3515bd813aa Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 11 Feb 2025 10:31:36 +0100
Subject: [PATCH 102/103] Vario

---
 .../UltimeConsegneClienteFragment.java                     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java
index 705c174a..8b6fde24 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java
@@ -19,6 +19,7 @@ import com.annimon.stream.Stream;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -192,7 +193,7 @@ public class UltimeConsegneClienteFragment extends BaseFragment implements Ultim
         List<DocumentoResoDTO> selectedOrders = getSelectedItems();
 
         if (dto.isSelected()) {
-            Stream.of(selectedOrders)
+            selectedOrders.stream()
                     .filter(x -> !x.getRagSoc().equalsIgnoreCase(dto.getRagSoc()))
                     .forEach(x -> x.setSelected(false));
         }
@@ -206,9 +207,9 @@ public class UltimeConsegneClienteFragment extends BaseFragment implements Ultim
 
 
     private List<DocumentoResoDTO> getSelectedItems() {
-        return Stream.of(this.mDocumentiMutableData)
+        return this.mDocumentiMutableData.stream()
                 .filter(DocumentoResoDTO::isSelected)
-                .toList();
+                .collect(Collectors.toList());
     }
 
 

From 57ced048a0b68857a91631649c0f6c1c17c86fe0 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 11 Feb 2025 10:33:06 +0100
Subject: [PATCH 103/103] -> v1.43.03 (468)

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

diff --git a/app/build.gradle b/app/build.gradle
index 0f80e1a5..667d7e3f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 467
-    def appVersionName = '1.43.02'
+    def appVersionCode = 468
+    def appVersionName = '1.43.03'
 
     signingConfigs {
         release {