diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
index bc0e1560..87a013ee 100644
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -1,7 +1,7 @@
 <?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">
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/build.gradle b/app/build.gradle
index 5817e59e..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 {
@@ -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'
 
@@ -164,9 +161,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')
@@ -184,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/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
index 8f5d1df8..0fc058e3 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;
@@ -112,6 +113,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;
@@ -148,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
@@ -223,8 +227,10 @@ import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracc
         ArticoliInGiacenzaModule.class,
         DialogTracciamentoImballiModule.class,
         DialogAskVettoreModule.class,
+        DialogAskVettoreModule.class,
         DialogCreateNewArtModule.class,
-        DialogSwitchUserDepoModule.class
+        DialogSwitchUserDepoModule.class,
+        DialogUpdateAvailableModule.class
 })
 public interface MainApplicationComponent {
 
@@ -371,10 +377,16 @@ public interface MainApplicationComponent {
 
     DialogAskVettoreComponent.Factory dialogAskVettoreComponent();
 
+    DialogAskCommessaComponent.Factory dialogAskCommessaComponent();
+
     DialogCreateNewArtComponent.Factory dialogCreateNewArtComponent();
 
     DialogSwitchUserDepoComponent.Factory dialogSwitchUserDepoComponent();
 
+    ProdRientroMerceOrderListComponent.Factory prodRientroMerceOrderListComponent();
+
+    DialogUpdateAvailableComponent.Factory dialogUpdateAvailableComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
index 3d6504ac..515b90b8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
@@ -36,12 +36,14 @@ 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;
 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 +207,12 @@ public class MainApplicationModule {
         return new AziendaRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    ProduzioneRESTConsumer provideProduzioneRESTConsumer() {
+        return new ProduzioneRESTConsumer();
+    }
+
     @Provides
     @Singleton
     BarcodeRESTConsumer provideBarcodeRESTConsumer(Ean128Service ean128Service) {
@@ -313,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/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/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/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..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
@@ -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());
@@ -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/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 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/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/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/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/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/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/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/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/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/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/ArticoloRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java
index 47e625b5..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
@@ -19,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;
@@ -29,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
@@ -46,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);
                     }
                 });
     }
@@ -63,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);
                     }
                 });
     }
@@ -85,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) -> {
@@ -94,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);
                     }
                 });
     }
@@ -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);
                     }
                 });
     }
@@ -135,15 +135,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);
                     }
                 });
 
@@ -152,15 +152,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);
             }
         });
 
@@ -250,7 +250,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 -> {
@@ -259,8 +259,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);
                     }
                 });
     }
@@ -274,7 +274,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 -> {
@@ -283,8 +283,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 3dcd2596..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
@@ -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,9 +30,11 @@ 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;
+import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.SpostaULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.UpdateTipoULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
@@ -45,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
@@ -81,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);
@@ -284,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 -> {
@@ -301,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);
             }
         });
     }
@@ -325,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()) {
 
@@ -334,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);
                         }
 
@@ -384,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().isEmpty()) {
+                                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) {
@@ -425,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 -> {
@@ -434,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);
                     }
                 });
     }
@@ -460,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 -> {
@@ -469,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);
                     }
                 });
 
@@ -494,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 -> {
@@ -503,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);
             }
         });
     }
@@ -523,20 +526,20 @@ 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);
             }
         });
     }
 
-    public void spostaArtsTraUL(MtbColt sourceMtbColt, MtbColt destMtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    public void spostaArtsTraUL(MtbColt sourceMtbColt, MtbColt destMtbColt, boolean flagForceUseRefs, RunnableArgs<List<MtbColr>> onComplete, RunnableArgs<Exception> onFailed) {
         new Thread(() -> {
             MtbColt mtbColtToMoveClone = (MtbColt) sourceMtbColt.clone();
             MtbColt mtbColtDestClone = (MtbColt) destMtbColt.clone();
@@ -551,20 +554,21 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
             SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO = new SpostaArtsTraULRequestDTO()
                     .setSourceMtbColt(mtbColtToMoveClone)
-                    .setDestinationMtbColt(mtbColtDestClone);
+                    .setDestinationMtbColt(mtbColtDestClone)
+                    .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<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                public void onResponse(Call<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> call, Response<ServiceRESTResponse<SpostaArtsTraULResponseDTO>> response) {
                     analyzeAnswer(response, "spostaArtsTraUL", data -> {
-                        onComplete.run();
+                        onComplete.run(data.getGeneratedMtbColr());
                     }, onFailed);
                 }
 
                 @Override
-                public void onFailure(Call<ServiceRESTResponse<Void>> 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();
@@ -580,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 -> {
@@ -589,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);
             }
         });
     }
@@ -605,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 -> {
@@ -642,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);
             }
         });
     }
@@ -653,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 -> {
@@ -663,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);
             }
         });
     }
@@ -703,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);
                     }
                 });
 
@@ -721,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);
                     }
                 });
 
@@ -744,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/ColliMagazzinoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java
index 5da77d5e..2724988b 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.SpostaULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.UpdateTipoULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
@@ -40,7 +41,7 @@ public interface ColliMagazzinoRESTConsumerService {
     Call<ServiceRESTResponse<Void>> spostaUL(@Body SpostaULRequestDTO requestDto);
 
     @POST("wms/spostaArtsTraUL")
-    Call<ServiceRESTResponse<Void>> 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/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/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/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/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/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/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/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/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/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
new file mode 100644
index 00000000..ae7f2e55
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumer.java
@@ -0,0 +1,40 @@
+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.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.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 ManagedErrorCallback<>() {
+                    @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, @NonNull final Exception e) {
+                        onFailed.run(e);
+                    }
+                });
+    }
+
+}
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/consumers/SystemRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
index da5fd31c..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
@@ -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,20 @@ 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) {
+                        if(response.code() == 404) {
+                            onSuccess.run(null);
+                            return;
+                        }
+
                         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 +65,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 +86,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 +104,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 +113,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 +159,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/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/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/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/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/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/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/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/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index 3c804c7c..6964148f 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
@@ -26,6 +26,7 @@ public class DBSettingsModel {
     private boolean flagMultiClienteOrdV;
     private boolean flagUseCodAnagAziendale;
     private boolean flagAskClienteInPickingLibero;
+    private boolean flagAskCommessaInPickingLiberoLav;
     private boolean flagPickLiberoAllowEmptyCliente;
 
     private boolean flagCanAddExtraItemSpedizione;
@@ -88,6 +89,10 @@ public class DBSettingsModel {
     private boolean suggestDataScad = false;
     private boolean flagPositionChangeRequest = false;
     private String docInterniRequestNumDoc;
+    private String produzioneCodDtipCar;
+    private boolean produzioneGeneraDocCar;
+    private String produzioneCodDtipScar;
+    private boolean produzioneGeneraDocScar;
     private boolean flagEnableArtCreation;
     private List<String> allowedCodMgrpForArtCreation;
     private boolean flagAccettazioneGroupListForn = false;
@@ -190,6 +195,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;
     }
@@ -722,6 +736,42 @@ public class DBSettingsModel {
         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;
+    }
+
     public List<String> getAllowedCodMgrpForArtCreation() {
         return allowedCodMgrpForArtCreation;
     }
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 f5671261..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;
             }
@@ -255,6 +255,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")
@@ -601,6 +606,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));
+
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("SETUP")
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/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/update/UpdatesManager.java b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java
index 3aaee7d8..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,22 +37,33 @@ public class UpdatesManager {
 
         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 == null)
+                return;
 
-            if(latestData.isForced())
-                appUpdater.setButtonDismiss(null);
+            showDialog(latestData, () -> {
+                installAPK(currentDownloadUrl);
+            });
 
-            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/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/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/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/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/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/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/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/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_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/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
index 10d5a499..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;
@@ -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);
@@ -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/AccettazioneBollaPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
index cf7f146b..ecdac401 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;
@@ -668,8 +662,8 @@ public class AccettazioneBollaPickingViewModel {
                     .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
                     .setMtbAart(pickingObjectDTO.getMtbAart());
 
-            pickingObjectDTO.getWithdrawMtbColrs().add(0, insertedMtbColr);
-            mCurrentMtbColt.getMtbColr().add(0, insertedMtbColr);
+            pickingObjectDTO.getWithdrawMtbColrs().add(insertedMtbColr);
+            mCurrentMtbColt.getMtbColr().add(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/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/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_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_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/AccettazioneOrdiniPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
index 99ef94a5..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;
@@ -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);
         });
     }
 
@@ -410,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);
             }
 
@@ -468,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);
             }
 
@@ -523,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);
             }
 
@@ -579,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);
             }
 
@@ -776,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();
         });
     }
 
@@ -821,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/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
index 657299dc..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
@@ -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
@@ -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));
@@ -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,18 +467,18 @@ 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());
                 });
 
         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;
@@ -568,33 +568,47 @@ 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) {
 
+            BigDecimal numCnf = UtilityBigDecimal.isNull(numCnfDaPrelevare, numCnfDaEvadere);
+            BigDecimal qtaTot = UtilityBigDecimal.isNull(qtaColDaPrelevare, qtaColDaEvadere);
+            BigDecimal qtaCnf = UtilityBigDecimal.isNull(qtaCnfDaPrelevare, qtaCnfDaEvadere);
+
+            this.saveNewRow(pickingObjectDTO,
+                    numCnf,
+                    qtaCnf,
+                    qtaTot,
+                    partitaMag,
+                    dataScad,
+                    false);
+        } else {
+            this.sendOnItemDispatched(
+                    pickingObjectDTO,
+                    pickingObjectDTO.getMtbAart(),
+                    initialNumCnf, initialQtaCnf, initialQtaTot,
+                    qtaColDaEvadere,
+                    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/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/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/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/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/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/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/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/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/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/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/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/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
index 2b10d80b..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;
@@ -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();
     }
@@ -242,16 +247,18 @@ 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);
                 }
             });
 
-            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();
         });
     }
 
@@ -303,6 +310,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
@@ -370,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_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
index 0e48affd..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
@@ -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 {
@@ -208,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 {
@@ -291,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());
 
@@ -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);
         }
@@ -335,7 +340,19 @@ public class PickingLiberoViewModel {
         }
     }
 
-    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();
 
@@ -534,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 {
@@ -673,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);
 
@@ -750,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()) &&
@@ -886,6 +866,7 @@ public class PickingLiberoViewModel {
         }
 
         this.sendOnLoadingStarted();
+        this.mDefaultCommessa = null;
 
         mColliMagazzinoRESTConsumer.canULBeDeleted(mCurrentMtbColt, canBeDeleted -> {
             if (canBeDeleted) {
@@ -899,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();
 
@@ -954,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);
@@ -1012,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/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/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_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_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_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/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 45eb774c..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,20 +10,18 @@ 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;
 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;
 
@@ -40,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;
@@ -385,21 +378,21 @@ 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()));
 
-        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)
@@ -416,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/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/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_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_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_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_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_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/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 87%
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 c29fc86a..394459d9 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,14 +64,15 @@ 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, " +
-                "                                  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 " +
@@ -92,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, " +
@@ -106,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 " +
@@ -160,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 " +
@@ -213,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())
@@ -249,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())
@@ -273,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;
@@ -281,7 +287,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/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 cd1ba4f9..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
@@ -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 {
@@ -30,6 +27,10 @@ public class ProdRientroMerceViewModel {
         this.mMesRESTConsumer = mesRESTConsumer;
     }
 
+
+
+
+
     public void refreshOrderList() {
         this.sendOnOrdersLoadingStarted();
         String codAnag = SettingsManager.iDB().getFilterFornitoreProd();
@@ -37,10 +38,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..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
@@ -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;
@@ -87,7 +83,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 +117,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);
 
@@ -179,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;
@@ -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) {
@@ -272,70 +277,70 @@ 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);
+        });
     }
 
     public ProdRientroMerceOrderDetailFragment setOnMtbColtClicked(RunnableArgs<MtbColt> onMtbColtClicked) {
@@ -359,15 +364,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);
     }
@@ -402,6 +406,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/ProdRientroMerceOrderDetailModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailModule.java
index 2392a0d3..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
@@ -2,8 +2,10 @@ 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.ProduzioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.ProdRientroMerceOrderDetailRESTConsumer;
 
@@ -19,8 +21,11 @@ public class ProdRientroMerceOrderDetailModule {
     ProdRientroMerceOrderDetailViewModel provideProdRientroMerceOrderDetailViewModel(
             ProdRientroMerceOrderDetailRESTConsumer prodRientroMerceOrderDetailRESTConsumer,
             ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
-            PrinterRESTConsumer printerRESTConsumer) {
-        return new ProdRientroMerceOrderDetailViewModel(prodRientroMerceOrderDetailRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer);
+            PrinterRESTConsumer printerRESTConsumer,
+            ArticoloRESTConsumer articoloRESTConsumer,
+            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/ProdRientroMerceOrderDetailPickedQuantityDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java
index 47745eea..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
@@ -8,11 +8,14 @@ import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 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 ObservableMtbTcol mtbTCol;
     private JtbFasi jtbFasi;
@@ -26,6 +29,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 +92,15 @@ public class ProdRientroMerceOrderDetailPickedQuantityDTO {
         return this;
     }
 
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
     public ObservableMtbTcol getMtbTCol() {
         return mtbTCol;
     }
@@ -79,13 +109,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 152f96a3..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
@@ -2,22 +2,33 @@ 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.util.Date;
+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.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;
 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 +40,28 @@ 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 final ProduzioneRESTConsumer produzioneRESTConsumer;
 
     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,
+                                                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) {
@@ -51,79 +71,137 @@ public class ProdRientroMerceOrderDetailViewModel {
     }
 
     public void refreshMtbColts() {
-        this.sendOnLoadingStarted();
+        //this.sendOnLoadingStarted();
         this.mtbColtsOfOrder.postValue(null);
 
-        this.mProdRientroMerceOrderDetailRESTConsumer.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.mtbColtsOfOrder.postValue(mtbColts);
+                //this.sendOnLoadingEnded();
+            }, 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.getDataOrd()) +
+                    "     ) 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) {
 
-        new Thread(this::sendOnLoadingStarted).start();
+        this.sendOnLoadingStarted();
 
-        new Thread(() -> {
+        ImportColliDaProduzioneRequestDTO importColliDaProduzioneRequestDTO =
+                new ImportColliDaProduzioneRequestDTO()
+                        .setColliBancale(pickedQuantityDTO.getNumCnf().intValue())
+                        .setQtaCnf(pickedQuantityDTO.getQtaCnf())
+                        .setQtaCol(pickedQuantityDTO.getQtaCol())
+                        .setCodJcom(currentOrder.getCodJcom())
+                        .setCodJfas(pickedQuantityDTO.getCodJfas())
+                        .setCodMart(currentOrder.getCodProd())
+                        .setCodTcol(pickedQuantityDTO.getMtbTCol() != null ? pickedQuantityDTO.getMtbTCol().getCodTcol() : null)
+                        .setDataCollo(LocalDate.now())
+                        .setDataOrd(currentOrder.getDataOrd())
+                        .setNumOrd(currentOrder.getNumOrd())
+                        .setGestione(currentOrder.getGestione())
+                        .setPartitaMag(currentOrder.getPartitaMag())
+                        .setFornitore(currentOrder.getRagSocAnag())
+                        .setPesoLordo(pickedQuantityDTO.getPesoLordo())
+                        .setPesoNetto(pickedQuantityDTO.getPesoNetto())
+                        .setAutoGeneraVendita(false);
 
-            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.prodRientroMerceOrderDetailRESTConsumer.importColliDaProduzione(importColliDaProduzioneRequestDTO, mtbColtSaved -> {
 
-            this.mProdRientroMerceOrderDetailRESTConsumer.importColloDaProduzione(importColliDaProduzioneRequestDTO, mtbColtSaved -> {
-                synchronized (this.mtbColtsOfOrder) {
-                    this.mListener.onDataSaved(mtbColtSaved);
-                }
-            }, this::sendError);
+            if (SettingsManager.iDB().isProduzioneGeneraDocCar() || SettingsManager.iDB().isProduzioneGeneraDocScar()) {
+
+                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()));
 
 
-        }).start();
+                produzioneRESTConsumer.caricoProdFin(caricoProdFinDTO, () -> {
 
-    }
-
-    public void deleteLU(MtbColt mtbColt) {
-        new Thread(this::sendOnLoadingStarted).start();
-
-        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());
+                    synchronized (this.mtbColtsOfOrder) {
+                        this.sendOnLoadingEnded();
+                        this.mListener.onDataSaved(mtbColtSaved);
                     }
 
+                }, this::sendError);
+            } else {
+                synchronized (this.mtbColtsOfOrder) {
+                    this.sendOnLoadingEnded();
+                    this.mListener.onDataSaved(mtbColtSaved);
+                }
+            }
+        }, this::sendError);
+    }
+
+
+    public void deleteLU(MtbColt mtbColt) {
+        this.sendOnLoadingStarted();
+
+        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) {
@@ -155,7 +233,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) {
@@ -164,7 +242,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..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,13 +1,14 @@
 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;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -20,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
@@ -48,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";
 
@@ -108,31 +109,31 @@ 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 ManagedErrorCallback<>() {
+                    @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, @NonNull final Exception e) {
+                        onFailed.run(e);
+                    }
+                });
     }
 
 
     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 -> {
@@ -143,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/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 e7e53d50..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
@@ -1,7 +1,7 @@
 package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.dto;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
 
 public class ImportColliDaProduzioneRequestDTO {
 
@@ -15,9 +15,9 @@ public class ImportColliDaProduzioneRequestDTO {
 
     private int colliBancale;
     private BigDecimal qtaCnf;
-    private Date dataCollo;
+    private LocalDate dataCollo;
 
-    private Date dataOrd;
+    private LocalDate dataOrd;
     private int numOrd;
     private String codJfas;
     private String gestione;
@@ -26,6 +26,8 @@ public class ImportColliDaProduzioneRequestDTO {
     private Integer numRisorse;
     private String annotazioni;
 
+    private boolean autoGeneraVendita;
+
     public String getCodMart() {
         return codMart;
     }
@@ -107,20 +109,20 @@ 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;
     }
 
-    public Date getDataOrd() {
+    public LocalDate getDataOrd() {
         return dataOrd;
     }
 
-    public ImportColliDaProduzioneRequestDTO setDataOrd(Date dataOrd) {
+    public ImportColliDaProduzioneRequestDTO setDataOrd(LocalDate dataOrd) {
         this.dataOrd = dataOrd;
         return this;
     }
@@ -187,4 +189,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/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 c7f835e2..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;
@@ -16,18 +15,34 @@ 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.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.
@@ -36,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) {
@@ -55,6 +83,7 @@ public class ProdRientroMerceOrderListFragment extends Fragment {
         return prodRientroMerceOrderListFragment;
     }
 
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -67,24 +96,26 @@ 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)
-                .setOnItemChecked(x -> {
+                .setOnItemClicked(x -> {
                     if (mOnItemSelectedRunnable != null)
                         mOnItemSelectedRunnable.run(x.getOriginalModel());
                 });
@@ -99,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() {
@@ -114,13 +274,21 @@ 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
                 .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_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/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdViewModel.java
index e30ca795..041dac63 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/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java
index b47e3539..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
@@ -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());
 
@@ -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/dto/OrdineLavorazioneDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java
index e7f03c9d..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
@@ -2,16 +2,16 @@ 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 {
 
-    private String dataOrdProd;
+    private LocalDate dataOrdProd;
 
     private Integer numOrdProd;
 
@@ -37,13 +37,13 @@ public class OrdineLavorazioneDTO {
 
     private BigDecimal numPedane;
 
-    private String dataOrd;
+    private LocalDate dataOrd;
 
     private String flagEvasoProd;
 
     private String gestione;
 
-    private Integer numOrd;
+    private int numOrd;
 
     private String descrizioneProd;
 
@@ -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;
     }
 
@@ -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() {
@@ -169,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/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/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/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/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index c799dec5..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
@@ -17,12 +17,13 @@ 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;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import javax.inject.Inject;
 
@@ -39,6 +40,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;
@@ -317,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);
     }
 
 
@@ -363,7 +368,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);
 
@@ -416,7 +421,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()));
@@ -533,7 +538,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);
 
@@ -589,7 +594,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()));
@@ -783,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);
     }
@@ -860,13 +867,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();
@@ -1046,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/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
index f6ebc061..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
@@ -61,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;
@@ -365,7 +366,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) {
@@ -609,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()));
@@ -631,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()
@@ -667,10 +672,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 +704,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 {
@@ -877,7 +888,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 {
@@ -896,7 +907,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) {
 
 
         if (pickingObjectDTO.getTempPickData() != null && pickingObjectDTO.getTempPickData().getSourceMtbColt() != null && pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr() != null) {
@@ -954,20 +965,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();
@@ -1096,14 +1107,16 @@ 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) {
@@ -1122,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);
     }
 
@@ -1226,7 +1239,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);
         });
     }
 
@@ -1293,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()
@@ -1387,17 +1400,17 @@ 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
         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)) {
@@ -1466,7 +1479,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();
@@ -1660,6 +1677,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);
@@ -2057,7 +2091,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()
@@ -2103,7 +2138,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/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/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/ultime_consegne_cliente/UltimeConsegneClienteFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java
index 11d1fc4e..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,12 +193,12 @@ 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));
         }
 
-        if (selectedOrders != null && selectedOrders.size() > 0) {
+        if (selectedOrders != null && !selectedOrders.isEmpty()) {
             mBindings.mainFab.show();
         } else {
             mBindings.mainFab.hide();
@@ -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());
     }
 
 
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/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/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 4a2388ef..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 -> {
@@ -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/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 0a7e1ed4..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.size() != 0) {
-                            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/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/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/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/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
index 2b4d0120..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
@@ -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 (!isAdded() && !isInLayout() && !progressOpened) {
-            this.progressOpened = true;
-            super.show(manager, "loading-dialog");
-        }
+        if (isPending) return;
+
+        isPending = true;
+        handler.post(() -> {
+            try {
+                if (!manager.isDestroyed() && !isAdded()) {
+                    manager.executePendingTransactions();
+                    showNow(manager, "loading-dialog");
+
+                    mBindings.progressBar.setIndeterminate(isIndeterminateProgress());
+                    if (!isIndeterminateProgress()) mBindings.progressBar.setMax(100);
+                }
+            } finally {
+                isPending = false;
+            }
+        });
     }
 
-    @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/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java
index 905cdc43..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("");
             }
@@ -124,7 +126,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 +135,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 +184,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 6d7f1218..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
@@ -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()) {
@@ -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/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/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/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_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/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/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_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/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..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,16 +1,15 @@
 package it.integry.integrywmsnative.view.dialogs.input_quantity_v2;
 
+import android.text.SpannableString;
+
 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;
 
@@ -32,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;
@@ -393,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();
@@ -572,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)) {
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..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
@@ -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 -> {
@@ -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);
@@ -177,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);
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/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/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-large/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
index a67fc559..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
@@ -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" />
 
@@ -137,11 +137,12 @@
                                     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" />
 
                                 <com.google.android.material.progressindicator.LinearProgressIndicator
+                                    style="?attr/linearProgressIndicatorStyle"
                                     android:id="@+id/order_progress"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
@@ -247,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"
@@ -439,32 +441,33 @@
                                 <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"
                                         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">
 
                                         <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 +488,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,8 +1144,8 @@
                             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"
@@ -1150,6 +1153,15 @@
                                 app:icon="@drawable/ic_add_24dp"
                                 app:singleClick="@{() -> view.addULButtonClick()}" />
 
+                            <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"
+                                android:layout_marginStart="8dp"
+                                app:icon="@drawable/ic_add_24dp"
+                                app:singleClick="@{() -> view.addSingleUnitButtonClick()}" />
+
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
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/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/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/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/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_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_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"
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_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
index 2679d28e..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
@@ -7,6 +7,7 @@
     <data>
 
         <import type="android.view.View" />
+        <import type="it.integry.integrywmsnative.R" />
 
         <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
 
@@ -19,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
@@ -118,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" />
 
@@ -126,11 +131,12 @@
                                 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" />
 
                             <com.google.android.material.progressindicator.LinearProgressIndicator
+                                style="?attr/linearProgressIndicatorStyle"
                                 android:id="@+id/order_progress"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -237,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"
@@ -301,8 +308,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 +378,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"
@@ -429,32 +436,33 @@
                             <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"
                                     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">
 
                                     <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 +483,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 +498,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 +704,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>
@@ -708,420 +717,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"
@@ -1132,7 +727,6 @@
 
 
                         <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"
@@ -1140,6 +734,15 @@
                             app:icon="@drawable/ic_add_24dp"
                             app:singleClick="@{() -> view.addULButtonClick()}" />
 
+                        <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"
+                            android:layout_marginStart="8dp"
+                            app:icon="@drawable/ic_add_24dp"
+                            app:singleClick="@{() -> view.addSingleUnitButtonClick()}" />
+
 
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
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/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/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
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-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b65ea13f..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>
@@ -334,7 +339,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>
@@ -380,7 +385,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_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/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/custom_colors.xml b/app/src/main/res/values/custom_colors.xml
index 230b4313..72dab875 100644
--- a/app/src/main/res/values/custom_colors.xml
+++ b/app/src/main/res/values/custom_colors.xml
@@ -7,6 +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>
@@ -93,6 +96,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/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 696bed5e..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>
@@ -338,7 +342,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>
@@ -386,6 +390,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>
diff --git a/barcode_base_android_library/build.gradle b/barcode_base_android_library/build.gradle
index d2d34472..a27f8dba 100644
--- a/barcode_base_android_library/build.gradle
+++ b/barcode_base_android_library/build.gradle
@@ -36,5 +36,5 @@ configurations {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
 }
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
diff --git a/honeywellscannerlibrary/build.gradle b/honeywellscannerlibrary/build.gradle
index fc0f16a9..b3153695 100644
--- a/honeywellscannerlibrary/build.gradle
+++ b/honeywellscannerlibrary/build.gradle
@@ -38,6 +38,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/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");
diff --git a/keyobardemulatorscannerlibrary/build.gradle b/keyobardemulatorscannerlibrary/build.gradle
index 08b3fb7a..27dd3f80 100644
--- a/keyobardemulatorscannerlibrary/build.gradle
+++ b/keyobardemulatorscannerlibrary/build.gradle
@@ -37,6 +37,6 @@ configurations {
 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 a412d247..46c9a71a 100644
--- a/pointmobilescannerlibrary/build.gradle
+++ b/pointmobilescannerlibrary/build.gradle
@@ -35,6 +35,6 @@ configurations {
 
 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 59d32ead..40bb1543 100644
--- a/zebrascannerlibrary/build.gradle
+++ b/zebrascannerlibrary/build.gradle
@@ -37,7 +37,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')
 }