diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml
new file mode 100644
index 00000000..4a53bee8
--- /dev/null
+++ b/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
\ No newline at end of file
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..47a37baa 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-03-17T09:16:48.549771200Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=21088B8EFD" />
diff --git a/.idea/fileTemplates/Android Dialog.java b/.idea/fileTemplates/Android Dialog.java
index 452a0f27..a47314d9 100644
--- a/.idea/fileTemplates/Android Dialog.java	
+++ b/.idea/fileTemplates/Android Dialog.java	
@@ -122,5 +122,10 @@ Create the following layout resource file [dialog_${dashName}.xml]
         alertDialog.setOnShowListener(this);
         return alertDialog;
     }
+    
+    @Override
+    public void dismiss() {
+        if(getDialog() != null) getDialog().dismiss();
+    }
 
 }
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5817e59e..29328a32 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 = 485
+    def appVersionName = '1.45.03'
 
     signingConfigs {
         release {
@@ -116,6 +116,11 @@ dependencies {
     implementation 'com.google.firebase:firebase-perf'
     implementation 'com.google.android.gms:play-services-basement:18.5.0'
 
+    //JJWT
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
 
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -150,10 +155,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 +166,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,14 +183,17 @@ 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'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
 
+    implementation 'org.greenrobot:eventbus:3.3.1'
+
     //Barcode generator
-    implementation group: 'com.google.zxing', name: 'core', version: '3.5.3'
+//    implementation group: 'com.google.zxing', name: 'core', version: '3.5.3'
+    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 }
 
 repositories {
diff --git a/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/18.json b/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/18.json
new file mode 100644
index 00000000..f62dface
--- /dev/null
+++ b/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/18.json
@@ -0,0 +1,1338 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 18,
+    "identityHash": "720c67adcc3f947a0c0ce04d4d04fbe9",
+    "entities": [
+      {
+        "tableName": "articoli_griglia",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`articolo_griglia_id` INTEGER PRIMARY KEY AUTOINCREMENT, `cod_mart` TEXT, `descrizione` TEXT, `unt_mis` TEXT, `qta_cnf` REAL NOT NULL, `bar_code` TEXT, `merce_da_ric` REAL NOT NULL, `media_sett` REAL NOT NULL, `flag_qta_multipla` TEXT, `qta_min_ordinabile` REAL NOT NULL, `gg_scadenza` INTEGER NOT NULL, `giacenza` REAL NOT NULL, `qta_prevista_vendita` REAL NOT NULL, `qta_proposta` REAL NOT NULL, `qta_ord` REAL NOT NULL, `id_griglia` INTEGER NOT NULL, `new_no_promo` INTEGER NOT NULL, FOREIGN KEY(`id_griglia`) REFERENCES `griglie`(`griglia_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "articoloGrigliaId",
+            "columnName": "articolo_griglia_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codMart",
+            "columnName": "cod_mart",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "descrizione",
+            "columnName": "descrizione",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "untMis",
+            "columnName": "unt_mis",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "qtaCnf",
+            "columnName": "qta_cnf",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "barCode",
+            "columnName": "bar_code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "merceDaRic",
+            "columnName": "merce_da_ric",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mediaSett",
+            "columnName": "media_sett",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "flagQtaMultipla",
+            "columnName": "flag_qta_multipla",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "qtaMinOrdinabile",
+            "columnName": "qta_min_ordinabile",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ggScadenza",
+            "columnName": "gg_scadenza",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "giacenza",
+            "columnName": "giacenza",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "qtaPrevistaVendita",
+            "columnName": "qta_prevista_vendita",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "qtaProposta",
+            "columnName": "qta_proposta",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "qtaOrd",
+            "columnName": "qta_ord",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "idGriglia",
+            "columnName": "id_griglia",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "newNoPromo",
+            "columnName": "new_no_promo",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "articolo_griglia_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_articoli_griglia_id_griglia",
+            "unique": false,
+            "columnNames": [
+              "id_griglia"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_articoli_griglia_id_griglia` ON `${TABLE_NAME}` (`id_griglia`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "griglie",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "id_griglia"
+            ],
+            "referencedColumns": [
+              "griglia_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "griglie",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`griglia_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `cod_alis` TEXT, `descr_lisa` TEXT, `descr_depo` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "grigliaId",
+            "columnName": "griglia_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "codAlis",
+            "columnName": "cod_alis",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "descrLisa",
+            "columnName": "descr_lisa",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "descrDepo",
+            "columnName": "descr_depo",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "griglia_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_griglie_cod_alis",
+            "unique": true,
+            "columnNames": [
+              "cod_alis"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_griglie_cod_alis` ON `${TABLE_NAME}` (`cod_alis`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ordini",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`ordine_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `data_ins` INTEGER, `annotazioni` TEXT, `transmitted` INTEGER NOT NULL, `transmission_date` INTEGER, `gestione` TEXT, `data_ord` INTEGER, `num_ord` INTEGER, `cod_mdep` TEXT, `id_griglia` INTEGER, `cod_alis` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "ordineId",
+            "columnName": "ordine_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataIns",
+            "columnName": "data_ins",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "annotazioni",
+            "columnName": "annotazioni",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "transmitted",
+            "columnName": "transmitted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "transmissionDate",
+            "columnName": "transmission_date",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "gestione",
+            "columnName": "gestione",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataOrd",
+            "columnName": "data_ord",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "numOrd",
+            "columnName": "num_ord",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codMdep",
+            "columnName": "cod_mdep",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "idGriglia",
+            "columnName": "id_griglia",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codAlis",
+            "columnName": "cod_alis",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "ordine_id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "articoli_ordine",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`articolo_ordine_id` INTEGER PRIMARY KEY AUTOINCREMENT, `cod_mart` TEXT, `descrizione` TEXT, `unt_mis` TEXT, `qta_cnf` REAL NOT NULL, `bar_code` TEXT, `merce_da_ric` REAL NOT NULL, `media_sett` REAL NOT NULL, `flag_qta_multipla` TEXT, `qta_min_ordinabile` REAL NOT NULL, `id_ordine` INTEGER NOT NULL, `qta_ord` REAL NOT NULL, `data_ins` INTEGER, `new_no_promo` INTEGER NOT NULL, `system_note` TEXT, `cod_alis` TEXT, FOREIGN KEY(`id_ordine`) REFERENCES `ordini`(`ordine_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "articoloOrdineId",
+            "columnName": "articolo_ordine_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codMart",
+            "columnName": "cod_mart",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "descrizione",
+            "columnName": "descrizione",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "untMis",
+            "columnName": "unt_mis",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "qtaCnf",
+            "columnName": "qta_cnf",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "barCode",
+            "columnName": "bar_code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "merceDaRic",
+            "columnName": "merce_da_ric",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mediaSett",
+            "columnName": "media_sett",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "flagQtaMultipla",
+            "columnName": "flag_qta_multipla",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "qtaMinOrdinabile",
+            "columnName": "qta_min_ordinabile",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "idOrdine",
+            "columnName": "id_ordine",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "qtaOrd",
+            "columnName": "qta_ord",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataIns",
+            "columnName": "data_ins",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "newNoPromo",
+            "columnName": "new_no_promo",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "systemNote",
+            "columnName": "system_note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codAlis",
+            "columnName": "cod_alis",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "articolo_ordine_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_articoli_ordine_id_ordine",
+            "unique": false,
+            "columnNames": [
+              "id_ordine"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_articoli_ordine_id_ordine` ON `${TABLE_NAME}` (`id_ordine`)"
+          },
+          {
+            "name": "index_articoli_ordine_id_ordine_cod_mart",
+            "unique": true,
+            "columnNames": [
+              "id_ordine",
+              "cod_mart"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_articoli_ordine_id_ordine_cod_mart` ON `${TABLE_NAME}` (`id_ordine`, `cod_mart`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "ordini",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "id_ordine"
+            ],
+            "referencedColumns": [
+              "ordine_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "mtb_colt",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `username` TEXT, `gestione` TEXT, `data_collo` INTEGER, `ser_collo` TEXT, `num_collo` INTEGER, `rif_ord` TEXT, `cod_anag` TEXT, `cod_vdes` TEXT, `cod_mdep` TEXT, `cod_vlis` TEXT, `cod_dtip` TEXT, `cod_tcol` TEXT, `ser_doc` TEXT, `annotazioni` TEXT, `posizione` TEXT, `cod_dtip_provv` TEXT, `ser_doc_provv` TEXT, `cod_jfas` TEXT, `data_ord` INTEGER, `data_doc` INTEGER, `data_doc_provv` INTEGER, `cod_mgrp` TEXT, `data_vers` INTEGER, `segno` INTEGER, `num_ord` INTEGER, `num_doc` INTEGER, `num_doc_provv` INTEGER)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "gestione",
+            "columnName": "gestione",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataCollo",
+            "columnName": "data_collo",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "serCollo",
+            "columnName": "ser_collo",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "numCollo",
+            "columnName": "num_collo",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rifOrd",
+            "columnName": "rif_ord",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codAnag",
+            "columnName": "cod_anag",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codVdes",
+            "columnName": "cod_vdes",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codMdep",
+            "columnName": "cod_mdep",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codVlis",
+            "columnName": "cod_vlis",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codDtip",
+            "columnName": "cod_dtip",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codTcol",
+            "columnName": "cod_tcol",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "serDoc",
+            "columnName": "ser_doc",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "annotazioni",
+            "columnName": "annotazioni",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "posizione",
+            "columnName": "posizione",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codDtipProvv",
+            "columnName": "cod_dtip_provv",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "serDocProvv",
+            "columnName": "ser_doc_provv",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codJfas",
+            "columnName": "cod_jfas",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataOrd",
+            "columnName": "data_ord",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataDoc",
+            "columnName": "data_doc",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataDocProvv",
+            "columnName": "data_doc_provv",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codMgrp",
+            "columnName": "cod_mgrp",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataVers",
+            "columnName": "data_vers",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "segno",
+            "columnName": "segno",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "numOrd",
+            "columnName": "num_ord",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "numDoc",
+            "columnName": "num_doc",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "numDocProvv",
+            "columnName": "num_doc_provv",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_mtb_colt_data_collo_ser_collo_num_collo_gestione",
+            "unique": true,
+            "columnNames": [
+              "data_collo",
+              "ser_collo",
+              "num_collo",
+              "gestione"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_mtb_colt_data_collo_ser_collo_num_collo_gestione` ON `${TABLE_NAME}` (`data_collo`, `ser_collo`, `num_collo`, `gestione`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "mtb_colr",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `id_collo` INTEGER NOT NULL, `data_collo` INTEGER, `gestione` TEXT, `ser_collo` TEXT, `descrizione` TEXT, `num_collo` INTEGER, `riga` INTEGER, `riga_ord` INTEGER, `cod_mart` TEXT, `cod_barre` TEXT, `cod_col` TEXT, `cod_tagl` TEXT, `partita_mag` TEXT, `gestione_rif` TEXT, `ser_collo_rif` TEXT, `note` TEXT, `data_ord` INTEGER, `data_collo_rif` INTEGER, `qta_cnf` REAL, `qta_col` REAL, `num_ord` INTEGER, `num_etich` INTEGER, `num_collo_rif` INTEGER, `datetime_row` INTEGER, `cod_jcom` TEXT, `num_cnf` REAL, `causale` TEXT, `utente` TEXT, `cod_anag_doc` TEXT, `cod_dtip_doc` TEXT, `data_doc` INTEGER, `ser_doc` TEXT, `num_doc` INTEGER, `id_riga_doc` INTEGER, `unt_mis` TEXT, `data_scad` INTEGER, FOREIGN KEY(`id_collo`) REFERENCES `mtb_colt`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "idCollo",
+            "columnName": "id_collo",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataCollo",
+            "columnName": "data_collo",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "gestione",
+            "columnName": "gestione",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "serCollo",
+            "columnName": "ser_collo",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "descrizione",
+            "columnName": "descrizione",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "numCollo",
+            "columnName": "num_collo",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "riga",
+            "columnName": "riga",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rigaOrd",
+            "columnName": "riga_ord",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codMart",
+            "columnName": "cod_mart",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codBarre",
+            "columnName": "cod_barre",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codCol",
+            "columnName": "cod_col",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codTagl",
+            "columnName": "cod_tagl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "partitaMag",
+            "columnName": "partita_mag",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "gestioneRif",
+            "columnName": "gestione_rif",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "serColloRif",
+            "columnName": "ser_collo_rif",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataOrd",
+            "columnName": "data_ord",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataColloRif",
+            "columnName": "data_collo_rif",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "qtaCnf",
+            "columnName": "qta_cnf",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "qtaCol",
+            "columnName": "qta_col",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "numOrd",
+            "columnName": "num_ord",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "numEtich",
+            "columnName": "num_etich",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "numColloRif",
+            "columnName": "num_collo_rif",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datetimeRow",
+            "columnName": "datetime_row",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codJcom",
+            "columnName": "cod_jcom",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "numCnf",
+            "columnName": "num_cnf",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "causale",
+            "columnName": "causale",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "utente",
+            "columnName": "utente",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codAnagDoc",
+            "columnName": "cod_anag_doc",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codDtipDoc",
+            "columnName": "cod_dtip_doc",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataDoc",
+            "columnName": "data_doc",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "serDoc",
+            "columnName": "ser_doc",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "numDoc",
+            "columnName": "num_doc",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "idRigaDoc",
+            "columnName": "id_riga_doc",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "untMis",
+            "columnName": "unt_mis",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataScad",
+            "columnName": "data_scad",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_mtb_colr_data_collo_ser_collo_num_collo_gestione_riga",
+            "unique": true,
+            "columnNames": [
+              "data_collo",
+              "ser_collo",
+              "num_collo",
+              "gestione",
+              "riga"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_mtb_colr_data_collo_ser_collo_num_collo_gestione_riga` ON `${TABLE_NAME}` (`data_collo`, `ser_collo`, `num_collo`, `gestione`, `riga`)"
+          },
+          {
+            "name": "index_mtb_colr_id_collo",
+            "unique": false,
+            "columnNames": [
+              "id_collo"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_mtb_colr_id_collo` ON `${TABLE_NAME}` (`id_collo`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "mtb_colt",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "id_collo"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "inventari",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `id_inventario` INTEGER, `cod_mdep` TEXT NOT NULL, `data_inventario` INTEGER, `data_reg` INTEGER, `data_ver` INTEGER, `filtro` TEXT, `flag_stato` TEXT, `flag_operazione` TEXT, `cod_anag` TEXT, `cod_dtip` TEXT, `inserito_da` TEXT, `registrato_da` TEXT, `verificato_da` TEXT, `data_ora_inizio` INTEGER, `data_ora_fine` INTEGER, `causale` TEXT, `zona` TEXT, `new` INTEGER, `remote_sync_date` INTEGER)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "idInventario",
+            "columnName": "id_inventario",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codMdep",
+            "columnName": "cod_mdep",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataInventario",
+            "columnName": "data_inventario",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataReg",
+            "columnName": "data_reg",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataVer",
+            "columnName": "data_ver",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "filtro",
+            "columnName": "filtro",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "flagStato",
+            "columnName": "flag_stato",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "flagOperazione",
+            "columnName": "flag_operazione",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codAnag",
+            "columnName": "cod_anag",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codDtip",
+            "columnName": "cod_dtip",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "inseritoDa",
+            "columnName": "inserito_da",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "registratoDa",
+            "columnName": "registrato_da",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "verificatoDa",
+            "columnName": "verificato_da",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataOraInizio",
+            "columnName": "data_ora_inizio",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dataOraFine",
+            "columnName": "data_ora_fine",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "causale",
+            "columnName": "causale",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "zona",
+            "columnName": "zona",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isNew",
+            "columnName": "new",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "remoteSyncDate",
+            "columnName": "remote_sync_date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_inventari__id",
+            "unique": false,
+            "columnNames": [
+              "_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_inventari__id` ON `${TABLE_NAME}` (`_id`)"
+          },
+          {
+            "name": "index_inventari_id_inventario",
+            "unique": false,
+            "columnNames": [
+              "id_inventario"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_inventari_id_inventario` ON `${TABLE_NAME}` (`id_inventario`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "inventario_rows",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`parent_id` INTEGER, `cod_mart` TEXT, `partita_mag` TEXT, `descrizione` TEXT, `qta` REAL NOT NULL DEFAULT 0, `num_cnf` REAL NOT NULL DEFAULT 0, `qta_cnf` REAL NOT NULL DEFAULT 0, `unt_mis` TEXT NOT NULL DEFAULT '0', `data_ora_inv` INTEGER, `scan_cod_barre` TEXT, `zona` TEXT, `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `remote_sync_date` INTEGER, FOREIGN KEY(`parent_id`) REFERENCES `inventari`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codMart",
+            "columnName": "cod_mart",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "partitaMag",
+            "columnName": "partita_mag",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "descrizione",
+            "columnName": "descrizione",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "qta",
+            "columnName": "qta",
+            "affinity": "REAL",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "numConf",
+            "columnName": "num_cnf",
+            "affinity": "REAL",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "qtaConf",
+            "columnName": "qta_cnf",
+            "affinity": "REAL",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "untMis",
+            "columnName": "unt_mis",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'0'"
+          },
+          {
+            "fieldPath": "dataOraInv",
+            "columnName": "data_ora_inv",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "scanCodBarre",
+            "columnName": "scan_cod_barre",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "zona",
+            "columnName": "zona",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "remoteSyncDate",
+            "columnName": "remote_sync_date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_inventario_rows_parent_id",
+            "unique": false,
+            "columnNames": [
+              "parent_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_inventario_rows_parent_id` ON `${TABLE_NAME}` (`parent_id`)"
+          },
+          {
+            "name": "index_inventario_rows__id",
+            "unique": false,
+            "columnNames": [
+              "_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_inventario_rows__id` ON `${TABLE_NAME}` (`_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "inventari",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "verifica_giacenze",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`cod_mdep` TEXT NOT NULL, `data` INTEGER, `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `remote_sync_date` INTEGER)",
+        "fields": [
+          {
+            "fieldPath": "codMdep",
+            "columnName": "cod_mdep",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "remoteSyncDate",
+            "columnName": "remote_sync_date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_verifica_giacenze__id",
+            "unique": false,
+            "columnNames": [
+              "_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_verifica_giacenze__id` ON `${TABLE_NAME}` (`_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "verifica_giacenze_rows",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`parent_id` INTEGER, `created_at` INTEGER DEFAULT CURRENT_TIMESTAMP, `cod_mart` TEXT, `partita_mag` TEXT, `descrizione` TEXT, `qta_in_giacenza` REAL NOT NULL DEFAULT 0, `qta` REAL NOT NULL DEFAULT 0, `num_cnf` REAL NOT NULL DEFAULT 0, `qta_cnf` REAL NOT NULL DEFAULT 0, `scan_cod_barre` TEXT, `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `remote_sync_date` INTEGER, FOREIGN KEY(`parent_id`) REFERENCES `verifica_giacenze`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "CURRENT_TIMESTAMP"
+          },
+          {
+            "fieldPath": "codMart",
+            "columnName": "cod_mart",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "partitaMag",
+            "columnName": "partita_mag",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "descrizione",
+            "columnName": "descrizione",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "qtaInGiacenza",
+            "columnName": "qta_in_giacenza",
+            "affinity": "REAL",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "qta",
+            "columnName": "qta",
+            "affinity": "REAL",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "numConf",
+            "columnName": "num_cnf",
+            "affinity": "REAL",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "qtaConf",
+            "columnName": "qta_cnf",
+            "affinity": "REAL",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "scanCodBarre",
+            "columnName": "scan_cod_barre",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "remoteSyncDate",
+            "columnName": "remote_sync_date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_verifica_giacenze_rows_parent_id",
+            "unique": false,
+            "columnNames": [
+              "parent_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_verifica_giacenze_rows_parent_id` ON `${TABLE_NAME}` (`parent_id`)"
+          },
+          {
+            "name": "index_verifica_giacenze_rows__id",
+            "unique": false,
+            "columnNames": [
+              "_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_verifica_giacenze_rows__id` ON `${TABLE_NAME}` (`_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "verifica_giacenze",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '720c67adcc3f947a0c0ce04d4d04fbe9')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
index 8f5d1df8..7e32be22 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;
@@ -88,6 +89,8 @@ import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.selectArt
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaComponent;
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaModule;
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs.DialogScanGrigliaAcquistoComponent;
+import it.integry.integrywmsnative.gest.pv_verifica_giacenze.VerificaGiacenzeComponent;
+import it.integry.integrywmsnative.gest.pv_verifica_giacenze.VerificaGiacenzeModule;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeComponent;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeModule;
 import it.integry.integrywmsnative.gest.settings.MainSettingsComponent;
@@ -112,12 +115,21 @@ 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_deposito.DialogAskDepositoComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_deposito.DialogAskDepositoModule;
 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_livello_posizione.DialogAskLivelloPosizioneComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_livello_posizione.DialogAskLivelloPosizioneModule;
+import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUModule;
 import it.integry.integrywmsnative.view.dialogs.ask_unknown_barcode_notes.DialogAskUnknownBarcodeNotesComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_unknown_barcode_notes.DialogAskUnknownBarcodeNotesModule;
 import it.integry.integrywmsnative.view.dialogs.ask_vettore.DialogAskVettoreComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_vettore.DialogAskVettoreModule;
+import it.integry.integrywmsnative.view.dialogs.basket_lu.DialogBasketLUComponent;
+import it.integry.integrywmsnative.view.dialogs.basket_lu.DialogBasketLUModule;
 import it.integry.integrywmsnative.view.dialogs.bind_product_barcode_with_package.DialogBindProductBarcodeWithPackageComponent;
 import it.integry.integrywmsnative.view.dialogs.bind_product_barcode_with_package.DialogBindProductBarcodeWithPackageModule;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromMtbAartListComponent;
@@ -128,6 +140,8 @@ import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBat
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
 import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtComponent;
 import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtModule;
+import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoComponent;
+import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoModule;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUComponent;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUModule;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdComponent;
@@ -148,6 +162,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
@@ -179,6 +195,7 @@ import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracc
         DialogInputLUProdModule.class,
         DialogScanArtModule.class,
         DialogScanOrCreateLUModule.class,
+        DialogBasketLUModule.class,
         ProdFabbisognoLineeProdModule.class,
         VersamentoMerceModule.class,
         DialogAskMagazzinoProssimitaModule.class,
@@ -223,8 +240,15 @@ 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,
+        DialogAskPositionOfLUModule.class,
+        DialogAskLivelloPosizioneModule.class,
+        VerificaGiacenzeModule.class,
+        DialogExtraInfoModule.class,
+        DialogAskDepositoModule.class
 })
 public interface MainApplicationComponent {
 
@@ -280,6 +304,8 @@ public interface MainApplicationComponent {
 
     DialogScanOrCreateLUComponent.Factory dialogScanOrCreateLUComponent();
 
+    DialogBasketLUComponent.Factory dialogBasketLUComponent();
+
     ProdFabbisognoLineeProdComponent.Factory prodFabbisognoLineeProdComponent();
 
     VersamentoMerceComponent.Factory versamentoMerceComponent();
@@ -371,10 +397,26 @@ public interface MainApplicationComponent {
 
     DialogAskVettoreComponent.Factory dialogAskVettoreComponent();
 
+    DialogAskCommessaComponent.Factory dialogAskCommessaComponent();
+
     DialogCreateNewArtComponent.Factory dialogCreateNewArtComponent();
 
     DialogSwitchUserDepoComponent.Factory dialogSwitchUserDepoComponent();
 
+    ProdRientroMerceOrderListComponent.Factory prodRientroMerceOrderListComponent();
+
+    DialogUpdateAvailableComponent.Factory dialogUpdateAvailableComponent();
+
+    DialogAskPositionOfLUComponent.Factory dialogAskPositionOfLUComponent();
+
+    DialogAskLivelloPosizioneComponent.Factory dialogAskLivelloPosizioneComponent();
+
+    VerificaGiacenzeComponent.Factory verificaGiacenzeComponent();
+
+    DialogExtraInfoComponent.Factory dialogExtraInfoComponent();
+
+    DialogAskDepositoComponent.Factory dialogAskDepositoComponent();
+
     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..83e05b10 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
@@ -19,6 +19,8 @@ import it.integry.integrywmsnative.core.data_store.db.AppDatabase;
 import it.integry.integrywmsnative.core.ean128.Ean128Service;
 import it.integry.integrywmsnative.core.menu.MenuRESTConsumer;
 import it.integry.integrywmsnative.core.menu.MenuService;
+import it.integry.integrywmsnative.core.rest.AuthInterceptor;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.AziendaRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
@@ -31,17 +33,20 @@ import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.EntityRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
 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;
@@ -49,6 +54,7 @@ import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.sound.SoundAlertService;
 import it.integry.integrywmsnative.core.update.UpdatesManager;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
+import it.integry.integrywmsnative.gest.login.rest.AuthenticationRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
@@ -94,8 +100,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    MainContext providesMainContextNew(MenuService menuService, AppDatabase appDatabase, SystemRESTConsumer systemRESTConsumer) {
-        return new MainContext(mApplication.getApplicationContext(), menuService, appDatabase, systemRESTConsumer);
+    MainContext providesMainContextNew(MenuService menuService, AppDatabase appDatabase, SystemRESTConsumer systemRESTConsumer, AuthenticationRESTConsumer authenticationRESTConsumer) {
+        return new MainContext(mApplication.getApplicationContext(), menuService, appDatabase, systemRESTConsumer, authenticationRESTConsumer);
     }
 
     @Provides
@@ -112,6 +118,13 @@ public class MainApplicationModule {
         return new Ean128Service();
     }
 
+
+    @Provides
+    @Singleton
+    RESTBuilder providesRESTBuilder(AuthInterceptor authInterceptor) {
+        return new RESTBuilder(authInterceptor);
+    }
+
     @Provides
     @Singleton
     MenuService provideMenuService(MenuRESTConsumer menuRESTConsumer) {
@@ -120,8 +133,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    UpdatesManager provideUpdatesManager() {
-        return new UpdatesManager();
+    UpdatesManager provideUpdatesManager(ExecutorService executorService, Handler handler, SystemRESTConsumer systemRESTConsumer) {
+        return new UpdatesManager(executorService, handler, systemRESTConsumer);
     }
 
     @Provides
@@ -138,20 +151,20 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
-        return new OrdiniRESTConsumer(systemRESTConsumer, entityRESTConsumer);
+    OrdiniRESTConsumer provideOrdiniRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
+        return new OrdiniRESTConsumer(restBuilder, systemRESTConsumer, entityRESTConsumer);
     }
 
     @Provides
     @Singleton
-    GestSetupRESTConsumer provideGestSetupRESTConsumer() {
-        return new GestSetupRESTConsumer();
+    GestSetupRESTConsumer provideGestSetupRESTConsumer(RESTBuilder restBuilder) {
+        return new GestSetupRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    ArticoloRESTConsumer provideArticoloRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new ArticoloRESTConsumer(systemRESTConsumer);
+    ArticoloRESTConsumer provideArticoloRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService, SystemRESTConsumer systemRESTConsumer) {
+        return new ArticoloRESTConsumer(restBuilder, executorService, systemRESTConsumer);
     }
 
     @Provides
@@ -168,41 +181,48 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    MenuRESTConsumer provideMenuRESTConsumer() {
-        return new MenuRESTConsumer();
+    MenuRESTConsumer provideMenuRESTConsumer(RESTBuilder restBuilder) {
+        return new MenuRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    MagazzinoRESTConsumer provideMagazzinoRESTConsumer(ExecutorService executorService, SystemRESTConsumer systemRESTConsumer) {
-        return new MagazzinoRESTConsumer(executorService, systemRESTConsumer);
+    MagazzinoRESTConsumer provideMagazzinoRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService, SystemRESTConsumer systemRESTConsumer) {
+        return new MagazzinoRESTConsumer(restBuilder, executorService, systemRESTConsumer);
     }
 
     @Provides
     @Singleton
-    MesRESTConsumer provideMesRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new MesRESTConsumer(systemRESTConsumer);
+    MesRESTConsumer provideMesRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        return new MesRESTConsumer(restBuilder, systemRESTConsumer);
     }
 
     @Provides
     @Singleton
-    EntityRESTConsumer provideEntityRESTConsumer() {
-        return new EntityRESTConsumer();
+    EntityRESTConsumer provideEntityRESTConsumer(RESTBuilder restBuilder) {
+        return new EntityRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer,
+    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(RESTBuilder restBuilder,
+                                                                 SystemRESTConsumer systemRESTConsumer,
                                                                  ArticoloRESTConsumer articoloRESTConsumer,
                                                                  EntityRESTConsumer entityRESTConsumer,
                                                                  SettingsManager settingsManager) {
-        return new ColliMagazzinoRESTConsumer(systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer, settingsManager);
+        return new ColliMagazzinoRESTConsumer(restBuilder, systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer, settingsManager);
     }
 
     @Provides
     @Singleton
-    AziendaRESTConsumer provideAziendaRESTConsumer() {
-        return new AziendaRESTConsumer();
+    AziendaRESTConsumer provideAziendaRESTConsumer(RESTBuilder restBuilder) {
+        return new AziendaRESTConsumer(restBuilder);
+    }
+
+    @Provides
+    @Singleton
+    ProduzioneRESTConsumer provideProduzioneRESTConsumer(RESTBuilder restBuilder) {
+        return new ProduzioneRESTConsumer(restBuilder);
     }
 
     @Provides
@@ -213,56 +233,62 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    PrinterRESTConsumer providePrinterRESTConsumer() {
-        return new PrinterRESTConsumer();
+    PrinterRESTConsumer providePrinterRESTConsumer(RESTBuilder restBuilder) {
+        return new PrinterRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    SystemRESTConsumer provideSystemRESTConsumer() {
-        return new SystemRESTConsumer();
+    SystemRESTConsumer provideSystemRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        return new SystemRESTConsumer(restBuilder, executorService);
     }
 
     @Provides
     @Singleton
-    PVOrdiniAcquistoRESTConsumer providesPVOrdiniAcquistoRESTConsumer(MagazzinoRESTConsumer magazzinoRESTConsumer) {
-        return new PVOrdiniAcquistoRESTConsumer(magazzinoRESTConsumer);
+    PVOrdiniAcquistoRESTConsumer providesPVOrdiniAcquistoRESTConsumer(RESTBuilder restBuilder, MagazzinoRESTConsumer magazzinoRESTConsumer) {
+        return new PVOrdiniAcquistoRESTConsumer(restBuilder, magazzinoRESTConsumer);
     }
 
     @Provides
     @Singleton
-    PosizioniRESTConsumer providesPosizioniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new PosizioniRESTConsumer(systemRESTConsumer);
+    PosizioniRESTConsumer providesPosizioniRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        return new PosizioniRESTConsumer(restBuilder, systemRESTConsumer);
     }
 
     @Provides
     @Singleton
-    ProdFabbisognoLineeProdRESTConsumer providesProdFabbisognoLineeProdRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new ProdFabbisognoLineeProdRESTConsumer(systemRESTConsumer);
+    ProdFabbisognoLineeProdRESTConsumer providesProdFabbisognoLineeProdRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        return new ProdFabbisognoLineeProdRESTConsumer(restBuilder, systemRESTConsumer);
     }
 
     @Provides
     @Singleton
-    DocInterniRESTConsumer provideDocInterniRESTConsumer(MagazzinoRESTConsumer magazzinoRESTConsumer) {
-        return new DocInterniRESTConsumer(magazzinoRESTConsumer);
+    DocInterniRESTConsumer provideDocInterniRESTConsumer(RESTBuilder restBuilder, MagazzinoRESTConsumer magazzinoRESTConsumer) {
+        return new DocInterniRESTConsumer(restBuilder, magazzinoRESTConsumer);
     }
 
     @Provides
     @Singleton
-    GiacenzaRESTConsumer provideGiacenzaRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
-        return new GiacenzaRESTConsumer(articoloRESTConsumer);
+    GiacenzaRESTConsumer provideGiacenzaRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService, ArticoloRESTConsumer articoloRESTConsumer) {
+        return new GiacenzaRESTConsumer(restBuilder, executorService, articoloRESTConsumer);
     }
 
     @Provides
     @Singleton
-    ImballiRESTConsumer provideImballiRESTConsumer(ExecutorService executorService) {
-        return new ImballiRESTConsumer(executorService);
+    GiacenzaPvRESTConsumer provideGiacenzaPvRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        return new GiacenzaPvRESTConsumer(restBuilder, executorService);
     }
 
     @Provides
     @Singleton
-    VettoriRESTConsumer provideVettoriRESTConsumer(ExecutorService executorService) {
-        return new VettoriRESTConsumer(executorService);
+    ImballiRESTConsumer provideImballiRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        return new ImballiRESTConsumer(restBuilder, executorService);
+    }
+
+    @Provides
+    @Singleton
+    VettoriRESTConsumer provideVettoriRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        return new VettoriRESTConsumer(restBuilder, executorService);
     }
 
     @Provides
@@ -273,44 +299,50 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    ProductionLinesRESTConsumer provideProductionLinesRESTConsumer() {
-        return new ProductionLinesRESTConsumer();
+    ProductionLinesRESTConsumer provideProductionLinesRESTConsumer(RESTBuilder restBuilder) {
+        return new ProductionLinesRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    DocumentRESTConsumer provideDocumentiRESTConsumer() {
-        return new DocumentRESTConsumer();
+    DocumentRESTConsumer provideDocumentiRESTConsumer(RESTBuilder restBuilder) {
+        return new DocumentRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    ColliAccettazioneRESTConsumer provideColliAccettazioneRESTConsumer() {
-        return new ColliAccettazioneRESTConsumer();
+    ColliAccettazioneRESTConsumer provideColliAccettazioneRESTConsumer(RESTBuilder restBuilder) {
+        return new ColliAccettazioneRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    ColliSpedizioneRESTConsumer provideColliSpedizioneRESTConsumer() {
-        return new ColliSpedizioneRESTConsumer();
+    ColliSpedizioneRESTConsumer provideColliSpedizioneRESTConsumer(RESTBuilder restBuilder) {
+        return new ColliSpedizioneRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    ColliLavorazioneRESTConsumer provideColliLavorazioneRESTConsumer(SettingsManager settingsManager) {
-        return new ColliLavorazioneRESTConsumer(settingsManager);
+    ColliLavorazioneRESTConsumer provideColliLavorazioneRESTConsumer(RESTBuilder restBuilder, SettingsManager settingsManager) {
+        return new ColliLavorazioneRESTConsumer(restBuilder, settingsManager);
     }
 
     @Provides
     @Singleton
-    MagazzinoAutomaticoRESTConsumer provideMagazzinoAutomaticoRESTConsumer() {
-        return new MagazzinoAutomaticoRESTConsumer();
+    MagazzinoAutomaticoRESTConsumer provideMagazzinoAutomaticoRESTConsumer(RESTBuilder restBuilder) {
+        return new MagazzinoAutomaticoRESTConsumer(restBuilder);
     }
 
     @Provides
     @Singleton
-    MagazzinoBufferRESTConsumer provideMagazzinoBufferRESTConsumer() {
-        return new MagazzinoBufferRESTConsumer();
+    MagazzinoBufferRESTConsumer provideMagazzinoBufferRESTConsumer(RESTBuilder restBuilder) {
+        return new MagazzinoBufferRESTConsumer(restBuilder);
+    }
+
+    @Provides
+    @Singleton
+    MaterialiRESTConsumer provideMaterialiRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        return new MaterialiRESTConsumer(restBuilder, executorService);
     }
 
     @Provides
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/authentication/JwtUtils.java b/app/src/main/java/it/integry/integrywmsnative/core/authentication/JwtUtils.java
new file mode 100644
index 00000000..b381d61a
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/authentication/JwtUtils.java
@@ -0,0 +1,21 @@
+package it.integry.integrywmsnative.core.authentication;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jws;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.io.Decoders;
+import io.jsonwebtoken.security.Keys;
+
+public class JwtUtils {
+
+    private final static String SIGNING_KEY = "gICy3bjD56i/YFnBZZKe5ibiz3Snsp08nybGGziCV4ZcvyXBbyqWUnJ2wTrRXhOuf/xdljPXX0yBaqdAgvKthQ==";
+
+    public static Claims parseJwt(String token) {
+        Jws<Claims> jws = Jwts.parserBuilder()
+                .setSigningKey(Keys.hmacShaKeyFor(Decoders.BASE64.decode(SIGNING_KEY)))
+                .build()
+                .parseClaimsJws(token);
+
+        return jws.getBody();
+    }
+}
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..51baf9e8 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
@@ -19,6 +19,7 @@ import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.ProdRiposi
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale_su_mag_prossimita.ProdVersamentoMaterialeInBufferFragment;
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaFragment;
+import it.integry.integrywmsnative.gest.pv_verifica_giacenze.VerificaGiacenzeFragment;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.info_situazione_articolo.DialogInfoSituazioneArticoloView;
 import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment;
@@ -88,7 +89,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 +126,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 +183,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)
@@ -240,6 +243,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv)
                                         .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv)
                                         .setFragmentFactory(PVOrdiniAcquistoGrigliaFragment::newInstance))
+
                                 .addItem(new MenuItem()
                                         .setCodMenu("MG058")
                                         .setID(it.integry.integrywmsnative.R.id.nav_pv_doc_interni)
@@ -248,6 +252,14 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setDrawerIcon(R.drawable.ic_documents_outline)
                                         .setFragmentFactory(DocInterniFragment::newInstance))
 
+                                .addItem(new MenuItem()
+                                        .setCodMenu("MG075")
+                                        .setID(it.integry.integrywmsnative.R.id.nav_pv_verifica_giacenze)
+                                        .setTitleText(R.string.verifica_giacenze_menu)
+                                        .setTitleIcon(R.drawable.ic_dashboard_verifica_giacenze)
+                                        .setDrawerIcon(R.drawable.ic_drawer_verifica_giacenze)
+                                        .setFragmentFactory(VerificaGiacenzeFragment::newInstance))
+
 //                                .addItem(new MenuItem()
 //                                        .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto_trasmessi)
 //                                        .setTitleText(it.integry.integrywmsnative.R.string.transmitted_orders)
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java
index 5319ee25..42d3fe1b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java
@@ -19,6 +19,7 @@ import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityThread;
+import it.integry.integrywmsnative.gest.login.rest.AuthenticationRESTConsumer;
 
 @Singleton
 public class MainContext {
@@ -27,18 +28,19 @@ public class MainContext {
     private final MenuService menuService;
     private final AppDatabase appDatabase;
     private final SystemRESTConsumer systemRESTConsumer;
+    private final AuthenticationRESTConsumer authenticationRESTConsumer;
 
     private Listener mListener;
 
-    public MainContext(Context applicationContext, MenuService menuService, AppDatabase appDatabase, SystemRESTConsumer systemRESTConsumer) {
+    public MainContext(Context applicationContext, MenuService menuService, AppDatabase appDatabase, SystemRESTConsumer systemRESTConsumer, AuthenticationRESTConsumer authenticationRESTConsumer) {
         this.applicationContext = applicationContext;
         this.menuService = menuService;
         this.appDatabase = appDatabase;
         this.systemRESTConsumer = systemRESTConsumer;
+        this.authenticationRESTConsumer = authenticationRESTConsumer;
     }
 
     public void init() {
-
         try {
             BarcodeManager.init(applicationContext);
         } catch (Exception exception) {
@@ -46,20 +48,42 @@ public class MainContext {
         }
 
 
-        this.initDeviceId(() -> {
+        //this.initAuthSession(() -> {
+//        this.initDeviceId(() -> {
             this.initDBData(() -> {
                 this.initMenu(() -> {
 
                     if (mListener != null) mListener.onContextInitialized();
                 });
             });
-        });
+//        });
+        //});
 
 
         this.initServerStatusChecker();
 
+//        EventBus.getDefault().register(this);
     }
 
+//    @Subscribe(threadMode = ThreadMode.MAIN)
+//    public void onSessionExpired(SessionExpiredEvent event) {
+//        DialogSimpleMessageView.makeErrorDialog(
+//                        new SpannedString("La sessione è scaduta. Effettua nuovamente la login"),
+//                        null,
+//                        () -> {
+//                            logout(MainApplication::exit);
+//                        })
+//                .show(activity.getSupportFragmentManager(), "expired-session-error");
+//    }
+
+
+    private void initAuthSession(Runnable onComplete) {
+        this.authenticationRESTConsumer.me(obj -> {
+            onComplete.run();
+        }, ex -> {
+            if (mListener != null) mListener.onError(new SpannedString(ex.getMessage()));
+        });
+    }
 
     private void initDeviceId(Runnable onComplete) {
         if (SettingsManager.i().getUserSession().getDeviceId() != null) {
@@ -72,9 +96,9 @@ public class MainContext {
             SettingsManager.i().getUserSession().setDeviceId(fid.getResult());
             SettingsManager.update();
 
-            systemRESTConsumer.registerDevice(onComplete, ex -> {
-                if (mListener != null) mListener.onError(new SpannedString(ex.getMessage()));
-            });
+//            systemRESTConsumer.registerDevice(onComplete, ex -> {
+//                if (mListener != null) mListener.onError(new SpannedString(ex.getMessage()));
+//            });
         });
     }
 
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/data_store/db/AppDatabase.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java
index 9d829bee..f95d568b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java
@@ -22,14 +22,18 @@ import it.integry.integrywmsnative.core.data_store.db.dao.MtbColrDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.MtbColtDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.OrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.RawDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.VerificaGiacenzeDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.VerificaGiacenzeRowDao;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
 import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
-import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioEntity;
 import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
 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.data_store.db.entity.VerificaGiacenzeEntity;
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeRowEntity;
 
 @Database(entities = {
         ArticoloGriglia.class,
@@ -38,10 +42,12 @@ import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
         ArticoloOrdine.class,
         SqlMtbColt.class,
         SqlMtbColr.class,
-        InventarioRoomDTO.class,
-        InventarioRowRoomDTO.class
+        InventarioEntity.class,
+        InventarioRowRoomDTO.class,
+        VerificaGiacenzeEntity.class,
+        VerificaGiacenzeRowEntity.class
 },
-        version = 17)
+        version = 18)
 @TypeConverters({
         DateConverter.class,
         BigDecimalConverter.class,
@@ -70,7 +76,8 @@ public abstract class AppDatabase extends RoomDatabase {
                     .addMigrations(MIGRATION_13_14)
                     .addMigrations(MIGRATION_14_15)
                     .addMigrations(MIGRATION_15_16)
-                    .addMigrations(MIGRATION_16_17);
+                    .addMigrations(MIGRATION_16_17)
+                    .addMigrations(MIGRATION_17_18);
 
             sInstance = builder.build();
         }
@@ -95,6 +102,10 @@ public abstract class AppDatabase extends RoomDatabase {
 
     public abstract InventarioRowDao inventarioRowDao();
 
+    public abstract VerificaGiacenzeDao verificaGiacenzeDao();
+
+    public abstract VerificaGiacenzeRowDao verificaGiacenzeRowDao();
+
 
 
     static final Migration MIGRATION_10_11 = new Migration(10, 11) {
@@ -182,4 +193,28 @@ public abstract class AppDatabase extends RoomDatabase {
             database.execSQL("DROP TABLE _inventario_rows_old;");
         }
     };
+    static final Migration MIGRATION_17_18 = new Migration(17, 18) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("CREATE TABLE IF NOT EXISTS verifica_giacenze (_id INTEGER PRIMARY KEY AUTOINCREMENT, cod_mdep TEXT NOT NULL, data INTEGER, remote_sync_date INTEGER);");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_verifica_giacenze__id ON verifica_giacenze (_id);");
+
+            database.execSQL("CREATE TABLE IF NOT EXISTS verifica_giacenze_rows (" +
+                    "_id INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                    "parent_id INTEGER, " +
+                    "created_at INTEGER DEFAULT CURRENT_TIMESTAMP, " +
+                    "cod_mart TEXT, " +
+                    "partita_mag TEXT, " +
+                    "descrizione TEXT, " +
+                    "qta_in_giacenza REAL NOT NULL DEFAULT 0, " +
+                    "qta REAL NOT NULL DEFAULT 0, " +
+                    "num_cnf REAL NOT NULL DEFAULT 0, " +
+                    "qta_cnf REAL NOT NULL DEFAULT 0, " +
+                    "scan_cod_barre TEXT, " +
+                    "remote_sync_date INTEGER, " +
+                    "FOREIGN KEY(parent_id) REFERENCES verifica_giacenze(_id) ON UPDATE NO ACTION ON DELETE CASCADE );");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_verifica_giacenze_rows__id ON verifica_giacenze_rows (_id)");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_verifica_giacenze_rows_parent_id ON verifica_giacenze_rows (parent_id)");
+        }
+    };
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java
index 2c1e84dd..d1237f81 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java
@@ -18,6 +18,8 @@ import it.integry.integrywmsnative.core.data_store.db.dao.MtbColrDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.MtbColtDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.OrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.RawDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.VerificaGiacenzeDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.VerificaGiacenzeRowDao;
 import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.ArticoloGrigliaRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.GrigliaRepository;
@@ -32,10 +34,17 @@ import it.integry.integrywmsnative.core.data_store.db.repository.datasource.SqlM
 import it.integry.integrywmsnative.core.data_store.db.repository.datasource.SqlMtbColtDataSource;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.InventarioRepository;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.InventarioRowRepository;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRepository;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRowRepository;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.data_source.InventarioLocalDataSource;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.data_source.InventarioRowLocalDataSource;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.data_source.VerificaGiacenzeLocalDataSource;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.data_source.VerificaGiacenzeRowLocalDataSource;
 import it.integry.integrywmsnative.core.mapper.InventarioMapper;
 import it.integry.integrywmsnative.core.mapper.InventarioRowMapper;
+import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeMapper;
+import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeRowMapper;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.InventarioRESTConsumer;
 
 @Module
@@ -108,6 +117,11 @@ public class RoomModule {
         return appDatabase.inventarioRowDao();
     }
 
+    @Singleton
+    @Provides
+    InventarioMapper providesInventarioMapper(InventarioRowMapper inventarioRowMapper) {
+        return new InventarioMapper(inventarioRowMapper);
+    }
 
     @Singleton
     @Provides
@@ -117,8 +131,26 @@ public class RoomModule {
 
     @Singleton
     @Provides
-    InventarioMapper providesInventarioMapper(InventarioRowMapper inventarioRowMapper) {
-        return new InventarioMapper(inventarioRowMapper);
+    VerificaGiacenzeDao providesVerificaGiacenzeDao(AppDatabase appDatabase) {
+        return appDatabase.verificaGiacenzeDao();
+    }
+
+    @Singleton
+    @Provides
+    VerificaGiacenzeRowDao providesVerificaGiacenzeRowDao(AppDatabase appDatabase) {
+        return appDatabase.verificaGiacenzeRowDao();
+    }
+
+    @Singleton
+    @Provides
+    VerificaGiacenzeMapper providesVerificaGiacenzeMapper(VerificaGiacenzeRowMapper verificaGiacenzeRowMapper) {
+        return new VerificaGiacenzeMapper(verificaGiacenzeRowMapper);
+    }
+
+    @Singleton
+    @Provides
+    VerificaGiacenzeRowMapper providesVerificaGiacenzeRowMapper() {
+        return new VerificaGiacenzeRowMapper();
     }
 
 
@@ -182,4 +214,20 @@ public class RoomModule {
         return new InventarioRowRepository(inventarioRowLocalDataSource, inventarioRESTConsumer, inventarioRowMapper, handler);
     }
 
+    @Provides
+    VerificaGiacenzeRepository providesVerificaGiacenzeRepository(ExecutorService executorService, Handler handler,
+                                                               VerificaGiacenzeLocalDataSource verificaGiacenzeLocalDataSource,
+                                                               GiacenzaPvRESTConsumer giacenzaPvRESTConsumer,
+                                                               VerificaGiacenzeMapper verificaGiacenzeMapper) {
+        return new VerificaGiacenzeRepository(verificaGiacenzeLocalDataSource, giacenzaPvRESTConsumer, verificaGiacenzeMapper, handler, executorService);
+    }
+
+    @Provides
+    VerificaGiacenzeRowRepository providesVerificaGiacenzeRowRepository(ExecutorService executorService, Handler handler,
+                                                                        VerificaGiacenzeRowLocalDataSource verificaGiacenzeRowLocalDataSource,
+                                                                        GiacenzaPvRESTConsumer giacenzaPvRESTConsumer,
+                                                                        VerificaGiacenzeRowMapper verificaGiacenzeRowMapper) {
+        return new VerificaGiacenzeRowRepository(verificaGiacenzeRowLocalDataSource, giacenzaPvRESTConsumer, verificaGiacenzeRowMapper, handler, executorService);
+    }
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/InventarioDao.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/InventarioDao.java
index 79d345d3..a58227db 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/InventarioDao.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/InventarioDao.java
@@ -7,21 +7,21 @@ import java.util.List;
 
 import io.reactivex.rxjava3.core.Flowable;
 import it.integry.integrywmsnative.core.data_store.db.entity.BaseSyncDTO;
-import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioEntity;
 import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityDaoInterface;
 
 @Dao
-public interface InventarioDao extends EntityDaoInterface<InventarioRoomDTO> {
+public interface InventarioDao extends EntityDaoInterface<InventarioEntity> {
 
 
-    @Query("SELECT * FROM " + InventarioRoomDTO.TABLE_NAME +
+    @Query("SELECT * FROM " + InventarioEntity.TABLE_NAME +
             " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))")
-    List<InventarioRoomDTO> selectAll(boolean toBeSync);
+    List<InventarioEntity> selectAll(boolean toBeSync);
 
 
-    @Query("SELECT * FROM " + InventarioRoomDTO.TABLE_NAME +
+    @Query("SELECT * FROM " + InventarioEntity.TABLE_NAME +
             " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))" +
-            " ORDER BY " + InventarioRoomDTO.Columns.DATA_INVENTARIO + " DESC")
-    Flowable<List<InventarioRoomDTO>> selectAllFlowable(boolean toBeSync);
+            " ORDER BY " + InventarioEntity.Columns.DATA_INVENTARIO + " DESC")
+    Flowable<List<InventarioEntity>> selectAllFlowable(boolean toBeSync);
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/VerificaGiacenzeDao.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/VerificaGiacenzeDao.java
new file mode 100644
index 00000000..dae67d43
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/VerificaGiacenzeDao.java
@@ -0,0 +1,42 @@
+package it.integry.integrywmsnative.core.data_store.db.dao;
+
+import androidx.room.Dao;
+import androidx.room.Query;
+import androidx.room.Transaction;
+
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Flowable;
+import it.integry.integrywmsnative.core.data_store.db.entity.BaseSyncDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeEntity;
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeRowEntity;
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityDaoInterface;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.VerificaGiacenzeWithRowsWrapper;
+
+@Dao
+public interface VerificaGiacenzeDao extends EntityDaoInterface<VerificaGiacenzeEntity> {
+
+
+    @Transaction
+    @Query("SELECT * FROM " + VerificaGiacenzeEntity.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))")
+    List<VerificaGiacenzeWithRowsWrapper> selectAll(boolean toBeSync);
+
+    @Transaction
+    @Query("SELECT * FROM " + VerificaGiacenzeEntity.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))" +
+            " ORDER BY " + VerificaGiacenzeEntity.Columns.DATA + " DESC")
+    Flowable<List<VerificaGiacenzeWithRowsWrapper>> selectAllFlowable(boolean toBeSync);
+
+    @Transaction
+    @Query("SELECT * FROM " + VerificaGiacenzeEntity.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))" +
+            " ORDER BY " + VerificaGiacenzeEntity.Columns.DATA + " DESC" +
+            " LIMIT 1")
+    VerificaGiacenzeWithRowsWrapper selectLast(boolean toBeSync);
+
+    @Query("SELECT COALESCE(strftime('%s', 'now') - MAX(" + VerificaGiacenzeRowEntity.Columns.CREATED_AT + ") < :maxMinutes * 60, 0) as any_verifica_to_be_recovered" +
+            " FROM " + VerificaGiacenzeRowEntity.TABLE_NAME +
+            " WHERE (" + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL)")
+    boolean isAnotherVerificaGiacenzeInProgress(int maxMinutes);
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/VerificaGiacenzeRowDao.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/VerificaGiacenzeRowDao.java
new file mode 100644
index 00000000..dbef866a
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/VerificaGiacenzeRowDao.java
@@ -0,0 +1,25 @@
+package it.integry.integrywmsnative.core.data_store.db.dao;
+
+import androidx.room.Dao;
+import androidx.room.Query;
+
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Flowable;
+import it.integry.integrywmsnative.core.data_store.db.entity.BaseSyncDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeRowEntity;
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityDaoInterface;
+
+@Dao
+public interface VerificaGiacenzeRowDao extends EntityDaoInterface<VerificaGiacenzeRowEntity> {
+
+
+    @Query("SELECT * FROM " + VerificaGiacenzeRowEntity.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))")
+    List<VerificaGiacenzeRowEntity> selectAll(boolean toBeSync);
+
+    @Query("SELECT * FROM " + VerificaGiacenzeRowEntity.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))")
+    Flowable<List<VerificaGiacenzeRowEntity>> selectAllFlowable(boolean toBeSync);
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRoomDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioEntity.java
similarity index 97%
rename from app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRoomDTO.java
rename to app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioEntity.java
index 74011456..f64e1ea1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRoomDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioEntity.java
@@ -12,8 +12,8 @@ import java.util.List;
 
 import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityModelInterface;
 
-@Entity(tableName = InventarioRoomDTO.TABLE_NAME)
-public class InventarioRoomDTO extends BaseSyncDTO implements EntityModelInterface {
+@Entity(tableName = InventarioEntity.TABLE_NAME)
+public class InventarioEntity extends BaseSyncDTO implements EntityModelInterface {
 
     public static final String TABLE_NAME = "inventari";
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRowRoomDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRowRoomDTO.java
index 5b21ce9b..6509c8b3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRowRoomDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRowRoomDTO.java
@@ -4,7 +4,6 @@ import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
-import androidx.room.PrimaryKey;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -12,10 +11,11 @@ import java.time.LocalDateTime;
 import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityModelInterface;
 
 @Entity(
+        inheritSuperIndices = true,
         tableName = InventarioRowRoomDTO.TABLE_NAME,
         foreignKeys = {
                 @ForeignKey(
-                        entity = InventarioRoomDTO.class,
+                        entity = InventarioEntity.class,
                         parentColumns = {BaseSyncDTO.Columns.ID},
                         childColumns = {InventarioRowRoomDTO.Columns.PARENT_ID},
                         onDelete = ForeignKey.CASCADE
@@ -40,13 +40,6 @@ public class InventarioRowRoomDTO extends BaseSyncDTO implements EntityModelInte
         public static final String ZONA = "zona";
     }
 
-    /**
-     * The unique ID
-     */
-    @PrimaryKey(autoGenerate = true)
-    @ColumnInfo(index = true, name = BaseSyncDTO.Columns.ID)
-    private Long id;
-
     @ColumnInfo(index = true, name = Columns.PARENT_ID)
     private Long parentId;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/VerificaGiacenzeEntity.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/VerificaGiacenzeEntity.java
new file mode 100644
index 00000000..adc50821
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/VerificaGiacenzeEntity.java
@@ -0,0 +1,78 @@
+package it.integry.integrywmsnative.core.data_store.db.entity;
+
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityModelInterface;
+
+@Entity(
+        inheritSuperIndices = true,
+        tableName = VerificaGiacenzeEntity.TABLE_NAME
+)
+public class VerificaGiacenzeEntity extends BaseSyncDTO implements EntityModelInterface {
+
+    public static final String TABLE_NAME = "verifica_giacenze";
+
+    public static class Columns {
+        public static final String COD_MDEP = "cod_mdep";
+        public static final String DATA = "data";
+    }
+
+    @NonNull
+    @ColumnInfo(name = VerificaGiacenzeEntity.Columns.COD_MDEP)
+    private String codMdep;
+
+    @ColumnInfo(name = VerificaGiacenzeEntity.Columns.DATA)
+    private LocalDateTime data;
+
+    @Ignore
+    private List<VerificaGiacenzeRowEntity> verificaGiacenzeRowList;
+
+    @NonNull
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public void setCodMdep(@NonNull String codMdep) {
+        this.codMdep = codMdep;
+    }
+
+    public LocalDateTime getData() {
+        return data;
+    }
+
+    public void setData(LocalDateTime data) {
+        this.data = data;
+    }
+
+    public List<VerificaGiacenzeRowEntity> getVerificaGiacenzeRowList() {
+        return verificaGiacenzeRowList;
+    }
+
+    public void setVerificaGiacenzeRowList(List<VerificaGiacenzeRowEntity> verificaGiacenzeRowList) {
+        this.verificaGiacenzeRowList = verificaGiacenzeRowList;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+
+        VerificaGiacenzeEntity that = (VerificaGiacenzeEntity) o;
+        return getId().equals(that.getId()) && getCodMdep().equals(that.getCodMdep()) && Objects.equals(getData(), that.getData()) && Objects.equals(getVerificaGiacenzeRowList(), that.getVerificaGiacenzeRowList());
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getId().hashCode();
+        result = 31 * result + getCodMdep().hashCode();
+        result = 31 * result + Objects.hashCode(getData());
+        result = 31 * result + Objects.hashCode(getVerificaGiacenzeRowList());
+        return result;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/VerificaGiacenzeRowEntity.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/VerificaGiacenzeRowEntity.java
new file mode 100644
index 00000000..4267420b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/VerificaGiacenzeRowEntity.java
@@ -0,0 +1,211 @@
+package it.integry.integrywmsnative.core.data_store.db.entity;
+
+
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Objects;
+
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityModelInterface;
+
+@Entity(
+        inheritSuperIndices = true,
+        tableName = VerificaGiacenzeRowEntity.TABLE_NAME,
+        foreignKeys = {
+                @ForeignKey(
+                        entity = VerificaGiacenzeEntity.class,
+                        parentColumns = {BaseSyncDTO.Columns.ID},
+                        childColumns = {VerificaGiacenzeRowEntity.Columns.PARENT_ID},
+                        onDelete = ForeignKey.CASCADE
+                )
+        }
+)
+public class VerificaGiacenzeRowEntity extends BaseSyncDTO implements EntityModelInterface, Cloneable {
+    public static final String TABLE_NAME = "verifica_giacenze_rows";
+
+    public static class Columns {
+        public static final String PARENT_ID = "parent_id";
+        public static final String CREATED_AT = "created_at";
+        public static final String COD_MART = "cod_mart";
+        public static final String PARTITA_MAG = "partita_mag";
+        public static final String DESCRIZIONE = "descrizione";
+        public static final String QTA_IN_GIACENZA = "qta_in_giacenza";
+        public static final String QTA = "qta";
+        public static final String NUM_CNF = "num_cnf";
+        public static final String QTA_CNF = "qta_cnf";
+        public static final String SCAN_COD_BARRE = "scan_cod_barre";
+    }
+
+    @ColumnInfo(index = true, name = Columns.PARENT_ID)
+    private Long parentId;
+
+    @ColumnInfo(name = Columns.CREATED_AT, defaultValue = "CURRENT_TIMESTAMP")
+    private LocalDateTime createdAt = LocalDateTime.now();
+
+    @ColumnInfo(name = Columns.COD_MART)
+    private String codMart;
+
+    @ColumnInfo(name = Columns.PARTITA_MAG)
+    private String partitaMag;
+
+    @ColumnInfo(name = Columns.DESCRIZIONE)
+    private String descrizione;
+
+    @NonNull
+    @ColumnInfo(name = Columns.QTA_IN_GIACENZA, defaultValue = "0")
+    private BigDecimal qtaInGiacenza;
+
+    @NonNull
+    @ColumnInfo(name = Columns.QTA, defaultValue = "0")
+    private BigDecimal qta;
+
+    @NonNull
+    @ColumnInfo(name = Columns.NUM_CNF, defaultValue = "0")
+    private BigDecimal numConf;
+
+    @NonNull
+    @ColumnInfo(name = Columns.QTA_CNF, defaultValue = "0")
+    private BigDecimal qtaConf;
+
+    @ColumnInfo(name = Columns.SCAN_COD_BARRE)
+    private String scanCodBarre;
+
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public LocalDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(LocalDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public void setCodMart(String codMart) {
+        this.codMart = codMart;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public void setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public void setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+    }
+
+    @NonNull
+    public BigDecimal getQtaInGiacenza() {
+        return qtaInGiacenza;
+    }
+
+    public void setQtaInGiacenza(@NonNull BigDecimal qtaInGiacenza) {
+        this.qtaInGiacenza = qtaInGiacenza;
+    }
+
+    @NonNull
+    public BigDecimal getQta() {
+        return qta;
+    }
+
+    public void setQta(@NonNull BigDecimal qta) {
+        this.qta = qta;
+    }
+
+    @NonNull
+    public BigDecimal getNumConf() {
+        return numConf;
+    }
+
+    public void setNumConf(@NonNull BigDecimal numConf) {
+        this.numConf = numConf;
+    }
+
+    @NonNull
+    public BigDecimal getQtaConf() {
+        return qtaConf;
+    }
+
+    public void setQtaConf(@NonNull BigDecimal qtaConf) {
+        this.qtaConf = qtaConf;
+    }
+
+    public String getScanCodBarre() {
+        return scanCodBarre;
+    }
+
+    public void setScanCodBarre(String scanCodBarre) {
+        this.scanCodBarre = scanCodBarre;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+
+        VerificaGiacenzeRowEntity that = (VerificaGiacenzeRowEntity) o;
+        return getId().equals(that.getId()) && getParentId().equals(that.getParentId()) && getCodMart().equals(that.getCodMart()) && Objects.equals(getPartitaMag(), that.getPartitaMag()) && getQta().equals(that.getQta()) && getNumConf().equals(that.getNumConf()) && getQtaConf().equals(that.getQtaConf()) && Objects.equals(getScanCodBarre(), that.getScanCodBarre());
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getId().hashCode();
+        result = 31 * result + getParentId().hashCode();
+        result = 31 * result + getCodMart().hashCode();
+        result = 31 * result + Objects.hashCode(getPartitaMag());
+        result = 31 * result + getQta().hashCode();
+        result = 31 * result + getNumConf().hashCode();
+        result = 31 * result + getQtaConf().hashCode();
+        result = 31 * result + Objects.hashCode(getScanCodBarre());
+        return result;
+    }
+
+
+
+    @NonNull
+    @Override
+    public VerificaGiacenzeRowEntity clone() throws CloneNotSupportedException {
+        try {
+            VerificaGiacenzeRowEntity clone = (VerificaGiacenzeRowEntity) super.clone();
+
+            // Clona ID
+            clone.setId(getId() != null ? new Long(getId()) : null);
+            clone.setParentId(getParentId() != null ? new Long(getParentId()) : null);
+
+            // Clona le stringhe
+            clone.setCodMart(getCodMart() != null ? new String(getCodMart()) : null);
+            clone.setPartitaMag(getPartitaMag() != null ? new String(getPartitaMag()) : null);
+            clone.setDescrizione(getDescrizione() != null ? new String(getDescrizione()) : null);
+            clone.setScanCodBarre(getScanCodBarre() != null ? new String(getScanCodBarre()) : null);
+
+            // Clona i BigDecimal
+            clone.setQta(getQta() != null ? new BigDecimal(getQta().toString()) : null);
+            clone.setNumConf(getNumConf() != null ? new BigDecimal(getNumConf().toString()) : null);
+            clone.setQtaConf(getQtaConf() != null ? new BigDecimal(getQtaConf().toString()) : null);
+
+            return clone;
+        } catch (CloneNotSupportedException e) {
+            throw new AssertionError(); // Can't happen
+        }
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java
index cc005c21..7038f5c6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java
@@ -15,7 +15,7 @@ import java.util.concurrent.ExecutorService;
 import javax.inject.Inject;
 
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioEntity;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.data_source.InventarioLocalDataSource;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.mapper.InventarioMapper;
@@ -24,13 +24,13 @@ import it.integry.integrywmsnative.core.rest.consumers.InventarioRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityLiveData;
 
-public class InventarioRepository extends _BaseRepository<MtbInvent, InventarioRoomDTO, InventarioMapper, InventarioLocalDataSource, InventarioRESTConsumer> {
+public class InventarioRepository extends _BaseRepository<MtbInvent, InventarioEntity, InventarioMapper, InventarioLocalDataSource, InventarioRESTConsumer> {
 
     private final ExecutorService executorService;
 
     private final Handler handler;
 
-    private final MutableLiveData<List<InventarioRoomDTO>> internalLiveData = new MutableLiveData<>();
+    private final MutableLiveData<List<InventarioEntity>> internalLiveData = new MutableLiveData<>();
 
     @Inject
     public InventarioRepository(InventarioLocalDataSource localDataSource,
@@ -44,7 +44,7 @@ public class InventarioRepository extends _BaseRepository<MtbInvent, InventarioR
     }
 
 
-    public LiveData<List<InventarioRoomDTO>> retrieve(Runnable onComplete, RunnableArgs<Exception> onError) {
+    public LiveData<List<InventarioEntity>> retrieve(Runnable onComplete, RunnableArgs<Exception> onError) {
         localDataSource.makeSynchronousRetrieveAllLive(false)
                 .observeOn(Schedulers.io())
                 .subscribe(internalLiveData::postValue);
@@ -84,13 +84,13 @@ public class InventarioRepository extends _BaseRepository<MtbInvent, InventarioR
         });
     }
 
-    public void insert(InventarioRoomDTO inventarioDTO, Runnable onComplete, RunnableArgs<Exception> onError) {
+    public void insert(InventarioEntity inventarioDTO, Runnable onComplete, RunnableArgs<Exception> onError) {
         localDataSource.makeInsertRequest(inventarioDTO, localResult -> {
             if (onComplete != null) handler.post(onComplete);
         }, onError);
     }
 
-    public void export(InventarioRoomDTO inventarioDTO, Runnable onComplete, RunnableArgs<Exception> onError) {
+    public void export(InventarioEntity inventarioDTO, Runnable onComplete, RunnableArgs<Exception> onError) {
         remoteDataSource.makeInsertRequest(dataMapper.mapRoomToRest(inventarioDTO), () -> {
             inventarioDTO.setRemoteSyncDate(new Date());
 
@@ -100,7 +100,7 @@ public class InventarioRepository extends _BaseRepository<MtbInvent, InventarioR
         }, onError);
     }
 
-    public void delete(InventarioRoomDTO inventarioDTO, Runnable onComplete, RunnableArgs<Exception> onError) {
+    public void delete(InventarioEntity inventarioDTO, Runnable onComplete, RunnableArgs<Exception> onError) {
         localDataSource.makeDeleteRequest(inventarioDTO, onComplete, onError);
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/VerificaGiacenzeRepository.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/VerificaGiacenzeRepository.java
new file mode 100644
index 00000000..8a876d09
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/VerificaGiacenzeRepository.java
@@ -0,0 +1,59 @@
+package it.integry.integrywmsnative.core.data_store.db.respository_new;
+
+import android.os.Handler;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeEntity;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.data_source.VerificaGiacenzeLocalDataSource;
+import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeMapper;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.pv.VerificaGiacenzeDTO;
+
+public class VerificaGiacenzeRepository extends _BaseRepository<VerificaGiacenzeDTO, VerificaGiacenzeEntity, VerificaGiacenzeMapper, VerificaGiacenzeLocalDataSource, GiacenzaPvRESTConsumer> {
+
+    private final ExecutorService executorService;
+    private final Handler handler;
+
+
+    public VerificaGiacenzeRepository(VerificaGiacenzeLocalDataSource localDataSource,
+                                      GiacenzaPvRESTConsumer remoteDataSource,
+                                      VerificaGiacenzeMapper dataMapper,
+                                      Handler handler,
+                                      ExecutorService executorService) {
+        super(dataMapper, localDataSource, remoteDataSource);
+        this.handler = handler;
+        this.executorService = executorService;
+    }
+
+
+    public List<VerificaGiacenzeEntity> retrieve() {
+        return localDataSource.makeSynchronousRetrieveAllRequest(false);
+    }
+
+    public VerificaGiacenzeEntity retrieveLast() {
+        return localDataSource.makeSynchronousRetrieveLastRequest(false);
+    }
+
+
+    public boolean isAnotherVerificaGiacenzeInProgress(int maxMinutes) {
+        return localDataSource.isAnotherVerificaGiacenzeInProgress(maxMinutes);
+    }
+
+    public void clearPreviousSessions() {
+        var entities = retrieve();
+        for (var entity : entities) {
+            localDataSource.makeSynchronousDeleteRequest(entity);
+        }
+    }
+
+
+    public void insert(VerificaGiacenzeEntity entity) {
+        localDataSource.makeSynchronousInsertRequest(entity);
+    }
+
+    public void delete(VerificaGiacenzeEntity entity) {
+        localDataSource.makeSynchronousDeleteRequest(entity);
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/VerificaGiacenzeRowRepository.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/VerificaGiacenzeRowRepository.java
new file mode 100644
index 00000000..bddbcfd2
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/VerificaGiacenzeRowRepository.java
@@ -0,0 +1,55 @@
+package it.integry.integrywmsnative.core.data_store.db.respository_new;
+
+import android.os.Handler;
+
+import java.util.concurrent.ExecutorService;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeRowEntity;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.data_source.VerificaGiacenzeRowLocalDataSource;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeRowMapper;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.pv.VerificaGiacenzeRowDTO;
+
+public class VerificaGiacenzeRowRepository extends _BaseRepository<VerificaGiacenzeRowDTO, VerificaGiacenzeRowEntity, VerificaGiacenzeRowMapper, VerificaGiacenzeRowLocalDataSource, GiacenzaPvRESTConsumer> {
+
+    private final ExecutorService executorService;
+    private final Handler handler;
+
+
+    public VerificaGiacenzeRowRepository(VerificaGiacenzeRowLocalDataSource localDataSource,
+                                         GiacenzaPvRESTConsumer remoteDataSource,
+                                         VerificaGiacenzeRowMapper dataMapper,
+                                         Handler handler,
+                                         ExecutorService executorService) {
+        super(dataMapper, localDataSource, remoteDataSource);
+        this.handler = handler;
+        this.executorService = executorService;
+    }
+
+
+
+    public void insertSynchronized(VerificaGiacenzeRowEntity entity) {
+        localDataSource.makeSynchronousInsertRequest(entity);
+    }
+
+    public void insert(VerificaGiacenzeRowEntity entity, RunnableArgs<VerificaGiacenzeRowEntity> onComplete, RunnableArgs<Exception> onFailed) {
+        localDataSource.makeInsertRequest(entity, onComplete, onFailed);
+    }
+
+    public void updateSynchronized(VerificaGiacenzeRowEntity entity) {
+        localDataSource.makeSynchronousUpdateRequest(entity);
+    }
+
+    public void update(VerificaGiacenzeRowEntity entity, RunnableArgs<VerificaGiacenzeRowEntity> onComplete, RunnableArgs<Exception> onFailed) {
+        localDataSource.makeUpdateRequest(entity, onComplete, onFailed);
+    }
+
+    public void deleteSynchronized(VerificaGiacenzeRowEntity entity) {
+        localDataSource.makeSynchronousDeleteRequest(entity);
+    }
+
+    public void delete(VerificaGiacenzeRowEntity entity, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        localDataSource.makeDeleteRequest(entity, onComplete, onFailed);
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/InventarioLocalDataSource.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/InventarioLocalDataSource.java
index 4b9581e9..13f628e7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/InventarioLocalDataSource.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/InventarioLocalDataSource.java
@@ -8,24 +8,24 @@ import javax.inject.Singleton;
 
 import io.reactivex.rxjava3.core.Flowable;
 import it.integry.integrywmsnative.core.data_store.db.dao.InventarioDao;
-import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioEntity;
 
 @Singleton
-public class InventarioLocalDataSource extends _BaseRoomDataSource<InventarioRoomDTO, InventarioDao> {
+public class InventarioLocalDataSource extends _BaseRoomDataSource<InventarioEntity, InventarioDao> {
 
     @Inject
     public InventarioLocalDataSource(ExecutorService executorService, InventarioDao entityDao) {
-        super(executorService, entityDao, InventarioRoomDTO.TABLE_NAME);
+        super(executorService, entityDao, InventarioEntity.TABLE_NAME);
     }
 
     @Override
-    public List<InventarioRoomDTO> makeSynchronousRetrieveAllRequest(boolean onlyToBeSync) {
+    public List<InventarioEntity> makeSynchronousRetrieveAllRequest(boolean onlyToBeSync) {
         return entityDao
                 .selectAll(onlyToBeSync);
     }
 
     @Override
-    public Flowable<List<InventarioRoomDTO>> makeSynchronousRetrieveAllLive(boolean onlyToBeSync) {
+    public Flowable<List<InventarioEntity>> makeSynchronousRetrieveAllLive(boolean onlyToBeSync) {
         return entityDao
                 .selectAllFlowable(onlyToBeSync);
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/VerificaGiacenzeLocalDataSource.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/VerificaGiacenzeLocalDataSource.java
new file mode 100644
index 00000000..19685c5e
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/VerificaGiacenzeLocalDataSource.java
@@ -0,0 +1,63 @@
+package it.integry.integrywmsnative.core.data_store.db.respository_new.data_source;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.reactivex.rxjava3.core.Flowable;
+import it.integry.integrywmsnative.core.data_store.db.dao.VerificaGiacenzeDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeEntity;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.VerificaGiacenzeWithRowsWrapper;
+
+@Singleton
+public class VerificaGiacenzeLocalDataSource extends _BaseRoomDataSource<VerificaGiacenzeEntity, VerificaGiacenzeDao> {
+
+    @Inject
+    public VerificaGiacenzeLocalDataSource(ExecutorService executorService, VerificaGiacenzeDao entityDao) {
+        super(executorService, entityDao, VerificaGiacenzeEntity.TABLE_NAME);
+    }
+
+    @Override
+    public List<VerificaGiacenzeEntity> makeSynchronousRetrieveAllRequest(boolean onlyToBeSync) {
+        var data = entityDao
+                .selectAll(onlyToBeSync);
+
+        return data.stream()
+                .map(x -> {
+                    x.verificaGiacenze.setVerificaGiacenzeRowList(x.verificaGiacenzeRowList);
+                    return x.verificaGiacenze;
+                })
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public Flowable<List<VerificaGiacenzeEntity>> makeSynchronousRetrieveAllLive(boolean onlyToBeSync) {
+        Flowable<List<VerificaGiacenzeWithRowsWrapper>> listFlowable = entityDao
+                .selectAllFlowable(onlyToBeSync);
+
+        return listFlowable.map(x ->
+                x.stream()
+                        .map(y -> {
+                            y.verificaGiacenze.setVerificaGiacenzeRowList(y.verificaGiacenzeRowList);
+                            return y.verificaGiacenze;
+                        })
+                        .collect(Collectors.toList())
+        );
+    }
+
+    public VerificaGiacenzeEntity makeSynchronousRetrieveLastRequest(boolean onlyToBeSync) {
+        var lastEntity = entityDao
+                .selectLast(onlyToBeSync);
+
+        lastEntity.verificaGiacenze.setVerificaGiacenzeRowList(lastEntity.verificaGiacenzeRowList);
+
+        return lastEntity.verificaGiacenze;
+    }
+
+    public boolean isAnotherVerificaGiacenzeInProgress(int maxMinutes) {
+        return entityDao.isAnotherVerificaGiacenzeInProgress(maxMinutes);
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/VerificaGiacenzeRowLocalDataSource.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/VerificaGiacenzeRowLocalDataSource.java
new file mode 100644
index 00000000..23fd305d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/VerificaGiacenzeRowLocalDataSource.java
@@ -0,0 +1,34 @@
+package it.integry.integrywmsnative.core.data_store.db.respository_new.data_source;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.reactivex.rxjava3.core.Flowable;
+import it.integry.integrywmsnative.core.data_store.db.dao.VerificaGiacenzeRowDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeRowEntity;
+
+@Singleton
+public class VerificaGiacenzeRowLocalDataSource extends _BaseRoomDataSource<VerificaGiacenzeRowEntity, VerificaGiacenzeRowDao> {
+
+    @Inject
+    public VerificaGiacenzeRowLocalDataSource(ExecutorService executorService, VerificaGiacenzeRowDao entityDao) {
+        super(executorService, entityDao, VerificaGiacenzeRowEntity.TABLE_NAME);
+    }
+
+    @Override
+    public List<VerificaGiacenzeRowEntity> makeSynchronousRetrieveAllRequest(boolean onlyToBeSync) {
+        var data = entityDao
+                .selectAll(onlyToBeSync);
+        return data;
+    }
+
+    @Override
+    public Flowable<List<VerificaGiacenzeRowEntity>> makeSynchronousRetrieveAllLive(boolean onlyToBeSync) {
+        return entityDao
+                .selectAllFlowable(onlyToBeSync);
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/wrappers/VerificaGiacenzeWithRowsWrapper.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/wrappers/VerificaGiacenzeWithRowsWrapper.java
new file mode 100644
index 00000000..1bedba78
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/wrappers/VerificaGiacenzeWithRowsWrapper.java
@@ -0,0 +1,24 @@
+package it.integry.integrywmsnative.core.data_store.db.wrappers;
+
+import androidx.room.DatabaseView;
+import androidx.room.Embedded;
+import androidx.room.Relation;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.BaseSyncDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeEntity;
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeRowEntity;
+
+@DatabaseView
+public class VerificaGiacenzeWithRowsWrapper {
+
+    @Embedded
+    public VerificaGiacenzeEntity verificaGiacenze;
+
+    @Relation(
+            parentColumn = BaseSyncDTO.Columns.ID,
+            entityColumn = VerificaGiacenzeRowEntity.Columns.PARENT_ID
+    )
+    public List<VerificaGiacenzeRowEntity> verificaGiacenzeRowList;
+}
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/event/SessionExpiredEvent.java b/app/src/main/java/it/integry/integrywmsnative/core/event/SessionExpiredEvent.java
new file mode 100644
index 00000000..da2b4429
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/event/SessionExpiredEvent.java
@@ -0,0 +1,4 @@
+package it.integry.integrywmsnative.core.event;
+
+public class SessionExpiredEvent {
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepBarcodeException.java b/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepBarcodeException.java
new file mode 100644
index 00000000..8ea4be96
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepBarcodeException.java
@@ -0,0 +1,8 @@
+package it.integry.integrywmsnative.core.exception;
+
+public class InvalidCodMdepBarcodeException extends RuntimeException {
+
+    public InvalidCodMdepBarcodeException(String message) {
+        super(message);
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepException.java b/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepException.java
deleted file mode 100644
index 82d3d8a4..00000000
--- a/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package it.integry.integrywmsnative.core.exception;
-
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.utility.UtilityResources;
-
-public final class InvalidCodMdepException extends Exception {
-    public InvalidCodMdepException() {
-        super(UtilityResources.getString(R.string.invalid_codmdep));
-    }
-}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepLUException.java b/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepLUException.java
new file mode 100644
index 00000000..f4ee1b97
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepLUException.java
@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public final class InvalidCodMdepLUException extends Exception {
+
+    public InvalidCodMdepLUException() {
+        super(UtilityResources.getString(R.string.invalid_codmdep_error_message));
+    }
+
+    public InvalidCodMdepLUException(String codMdep) {
+        super(UtilityResources.getString(R.string.invalid_codmdep_error_message) + "(" + codMdep + ")");
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/exception/UnauthorizedAccessException.java b/app/src/main/java/it/integry/integrywmsnative/core/exception/UnauthorizedAccessException.java
new file mode 100644
index 00000000..a57b0eba
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/UnauthorizedAccessException.java
@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.exception;
+
+public class UnauthorizedAccessException extends Exception {
+    public UnauthorizedAccessException() {
+        super("Accesso non autorizzato. Si prega di effettuare nuovamente l'accesso e riprovare");
+    }
+}
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/expansion/BaseFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
index b3b79372..ef260694 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.expansion;
 
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,6 +31,9 @@ public abstract class BaseFragment extends Fragment {
     @Inject
     public ExecutorService executorService;
 
+    @Inject
+    public Handler handler;
+
     protected ElevatedToolbar mToolbar;
 
     protected final List<Runnable> mOnPreDestroyList = new ArrayList<>();
@@ -79,7 +83,7 @@ public abstract class BaseFragment extends Fragment {
     }
 
     public void onError(Exception ex) {
-        requireActivity().runOnUiThread(() -> {
+        handler.post(() -> {
             this.closeProgress();
             UtilityExceptions.defaultException(getActivity(), ex);
             BarcodeManager.enable();
@@ -102,7 +106,7 @@ public abstract class BaseFragment extends Fragment {
 
     protected void popMe() {
         if (requireActivity() instanceof IPoppableActivity) {
-            requireActivity().runOnUiThread(() -> {
+            handler.post(() -> {
                 ((IPoppableActivity) requireActivity()).pop();
             });
         } else {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/helper/ContextHelper.java b/app/src/main/java/it/integry/integrywmsnative/core/helper/ContextHelper.java
new file mode 100644
index 00000000..c6c76519
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/helper/ContextHelper.java
@@ -0,0 +1,26 @@
+package it.integry.integrywmsnative.core.helper;
+
+import android.content.Context;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
+import it.integry.integrywmsnative.core.utility.UtilityContext;
+
+public final class ContextHelper {
+
+    public static FragmentManager getFragmentManagerFromContext(Context context) {
+        if (context == null) {
+            throw new IllegalArgumentException("Context cannot be null");
+        }
+
+        if (context instanceof FragmentActivity) {
+            return ((FragmentActivity) context).getSupportFragmentManager();
+        } else if (UtilityContext.getMainActivity() != null) {
+            return UtilityContext.getMainActivity().getSupportFragmentManager();
+        }
+
+        return null;
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioMapper.java b/app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioMapper.java
index 038fad40..8c76b441 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioMapper.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioMapper.java
@@ -2,11 +2,11 @@ package it.integry.integrywmsnative.core.mapper;
 
 import javax.inject.Singleton;
 
-import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioEntity;
 import it.integry.integrywmsnative.core.model.MtbInvent;
 
 @Singleton
-public class InventarioMapper extends BaseMapper<MtbInvent, InventarioRoomDTO> {
+public class InventarioMapper extends BaseMapper<MtbInvent, InventarioEntity> {
 
     private final InventarioRowMapper inventarioRowMapper;
 
@@ -15,10 +15,10 @@ public class InventarioMapper extends BaseMapper<MtbInvent, InventarioRoomDTO> {
     }
 
     @Override
-    public InventarioRoomDTO mapRestToRoom(MtbInvent inputData) {
+    public InventarioEntity mapRestToRoom(MtbInvent inputData) {
         if(inputData == null) return null;
 
-        var data = new InventarioRoomDTO();
+        var data = new InventarioEntity();
         data.setIdInventario(inputData.getIdInventario());
         data.setCodMdep(inputData.getCodMdep());
         data.setDataInventario(inputData.getDataInventario());
@@ -42,7 +42,7 @@ public class InventarioMapper extends BaseMapper<MtbInvent, InventarioRoomDTO> {
     }
 
     @Override
-    public MtbInvent mapRoomToRest(InventarioRoomDTO inputData) {
+    public MtbInvent mapRoomToRest(InventarioEntity inputData) {
         if(inputData == null) return null;
 
         var data = new MtbInvent();
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/mapper/VerificaGiacenzeMapper.java b/app/src/main/java/it/integry/integrywmsnative/core/mapper/VerificaGiacenzeMapper.java
new file mode 100644
index 00000000..93ee36a8
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/mapper/VerificaGiacenzeMapper.java
@@ -0,0 +1,44 @@
+package it.integry.integrywmsnative.core.mapper;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeEntity;
+import it.integry.integrywmsnative.core.rest.model.pv.VerificaGiacenzeDTO;
+
+@Singleton
+public class VerificaGiacenzeMapper extends BaseMapper<VerificaGiacenzeDTO, VerificaGiacenzeEntity> {
+
+    private final VerificaGiacenzeRowMapper verificaGiacenzeRowMapper;
+
+    public VerificaGiacenzeMapper(VerificaGiacenzeRowMapper verificaGiacenzeRowMapper) {
+        this.verificaGiacenzeRowMapper = verificaGiacenzeRowMapper;
+    }
+
+
+    @Override
+    public VerificaGiacenzeEntity mapRestToRoom(VerificaGiacenzeDTO inputData) {
+        if(inputData == null) return null;
+
+        var data = new VerificaGiacenzeEntity();
+        data.setCodMdep(inputData.getCodMdep());
+        data.setData(inputData.getDataVerifica());
+
+        data.setVerificaGiacenzeRowList(verificaGiacenzeRowMapper.mapRestsToRooms(inputData.getRows()));
+
+        return data;
+    }
+
+    @Override
+    public VerificaGiacenzeDTO mapRoomToRest(VerificaGiacenzeEntity inputData) {
+        if(inputData == null) return null;
+
+        var data = new VerificaGiacenzeDTO();
+        data.setCodMdep(inputData.getCodMdep());
+        data.setDataVerifica(inputData.getData());
+
+        data.setRows(verificaGiacenzeRowMapper.mapRoomsToRests(inputData.getVerificaGiacenzeRowList()));
+
+
+        return data;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/mapper/VerificaGiacenzeRowMapper.java b/app/src/main/java/it/integry/integrywmsnative/core/mapper/VerificaGiacenzeRowMapper.java
new file mode 100644
index 00000000..dccfad7d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/mapper/VerificaGiacenzeRowMapper.java
@@ -0,0 +1,40 @@
+package it.integry.integrywmsnative.core.mapper;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeRowEntity;
+import it.integry.integrywmsnative.core.rest.model.pv.VerificaGiacenzeRowDTO;
+
+@Singleton
+public class VerificaGiacenzeRowMapper extends BaseMapper<VerificaGiacenzeRowDTO, VerificaGiacenzeRowEntity> {
+
+    @Override
+    public VerificaGiacenzeRowEntity mapRestToRoom(VerificaGiacenzeRowDTO inputData) {
+        if(inputData == null) return null;
+
+        var data = new VerificaGiacenzeRowEntity();
+        data.setCodMart(inputData.getCodMart());
+        data.setPartitaMag(inputData.getPartitaMag());
+        data.setQtaInGiacenza(inputData.getQtaInGiacenza());
+        data.setQta(inputData.getQta());
+        data.setNumConf(inputData.getNumCnf());
+        data.setQtaConf(inputData.getQtaCnf());
+        data.setScanCodBarre(inputData.getBarcode());
+        return data;
+    }
+
+    @Override
+    public VerificaGiacenzeRowDTO mapRoomToRest(VerificaGiacenzeRowEntity inputData) {
+        if(inputData == null) return null;
+
+        var data = new VerificaGiacenzeRowDTO();
+        data.setCodMart(inputData.getCodMart());
+        data.setPartitaMag(inputData.getPartitaMag());
+        data.setQtaInGiacenza(inputData.getQtaInGiacenza());
+        data.setQta(inputData.getQta());
+        data.setNumCnf(inputData.getNumConf());
+        data.setQtaCnf(inputData.getQtaConf());
+        data.setBarcode(inputData.getScanCodBarre());
+        return data;
+    }
+}
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..19f8b95d 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,30 +1,38 @@
 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
 public class MenuRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
+    public MenuRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
+
     public void retrieveMenu(String rootCodOpz, RunnableArgs<StbMenu> onComplete, RunnableArgs<Exception> onFailed) {
-        MenuRESTConsumerService menuRESTConsumerService = RESTBuilder.getService(MenuRESTConsumerService.class);
-        menuRESTConsumerService.retrieveMenuConfig(rootCodOpz).enqueue(new Callback<>() {
+        MenuRESTConsumerService menuRESTConsumerService = restBuilder.getService(MenuRESTConsumerService.class);
+        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..11ee83e3 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
@@ -5,7 +5,7 @@ import android.os.Parcelable;
 
 import java.math.BigDecimal;
 
-public class MtbDepo extends EntityBase implements Parcelable {
+public class MtbDepo extends EntityBase {
 
 
     private String codMdep;
@@ -41,79 +41,6 @@ public class MtbDepo extends EntityBase implements Parcelable {
         type = "mtb_depo";
     }
 
-    protected MtbDepo(Parcel in) {
-        codMdep = in.readString();
-        descrizione = in.readString();
-        flagVal = in.readString();
-        codAnag = in.readString();
-        indirizzo = in.readString();
-        cap = in.readString();
-        citta = in.readString();
-        prov = in.readString();
-        tel = in.readString();
-        nazione = in.readString();
-        fax = in.readString();
-        eMail = in.readString();
-        sitoWeb = in.readString();
-        codVdes = in.readString();
-        serie = in.readString();
-        flagMovimentabile = in.readString();
-        codJfas = in.readString();
-        codVlis = in.readString();
-        codCcau = in.readString();
-        codCcon = in.readString();
-        codDtip = in.readString();
-        codDtipFat = in.readString();
-        flagContoVendita = in.readString();
-        flagTipoNegozio = in.readString();
-        codMdepReso = in.readString();
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(codMdep);
-        dest.writeString(descrizione);
-        dest.writeString(flagVal);
-        dest.writeString(codAnag);
-        dest.writeString(indirizzo);
-        dest.writeString(cap);
-        dest.writeString(citta);
-        dest.writeString(prov);
-        dest.writeString(tel);
-        dest.writeString(nazione);
-        dest.writeString(fax);
-        dest.writeString(eMail);
-        dest.writeString(sitoWeb);
-        dest.writeString(codVdes);
-        dest.writeString(serie);
-        dest.writeString(flagMovimentabile);
-        dest.writeString(codJfas);
-        dest.writeString(codVlis);
-        dest.writeString(codCcau);
-        dest.writeString(codCcon);
-        dest.writeString(codDtip);
-        dest.writeString(codDtipFat);
-        dest.writeString(flagContoVendita);
-        dest.writeString(flagTipoNegozio);
-        dest.writeString(codMdepReso);
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    public static final Creator<MtbDepo> CREATOR = new Creator<MtbDepo>() {
-        @Override
-        public MtbDepo createFromParcel(Parcel in) {
-            return new MtbDepo(in);
-        }
-
-        @Override
-        public MtbDepo[] newArray(int size) {
-            return new MtbDepo[size];
-        }
-    };
 
     public String getCodMdep() {
         return codMdep;
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/AuthInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java
new file mode 100644
index 00000000..9ae9fe08
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java
@@ -0,0 +1,78 @@
+package it.integry.integrywmsnative.core.rest;
+
+import androidx.annotation.NonNull;
+
+import java.io.IOException;
+
+import io.jsonwebtoken.Claims;
+import it.integry.integrywmsnative.core.authentication.JwtUtils;
+import it.integry.integrywmsnative.core.exception.UnauthorizedAccessException;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.gest.login.rest.RefreshRESTConsumer;
+import okhttp3.Interceptor;
+import okhttp3.Protocol;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+public class AuthInterceptor implements Interceptor {
+
+    private final RefreshRESTConsumer refreshRESTConsumer;
+
+    public AuthInterceptor(RefreshRESTConsumer refreshRESTConsumer) {
+        this.refreshRESTConsumer = refreshRESTConsumer;
+    }
+
+    @NonNull
+    @Override
+    public Response intercept(@NonNull Chain chain) throws IOException {
+        var originalRequest = chain.request();
+
+        if (SettingsManager.i().getUserSession() != null) {
+
+            var accessToken = SettingsManager.i().getUserSession().getAccessToken();
+            var accessTokenExpiryDate = SettingsManager.i().getUserSession().getAccessTokenExpiryDate();
+
+            if (accessToken != null && (accessTokenExpiryDate == null || UtilityDate.getNowTime().isAfter(accessTokenExpiryDate.minusSeconds(20)))) {
+
+                // Make the token refresh request
+                try {
+                    var response = refreshRESTConsumer.makeSynchronousRefreshTokenRequest();
+
+                    Claims claims = JwtUtils.parseJwt(response.getAccessToken());
+
+                    SettingsManager.i().getUserSession()
+                            .setAccessToken(response.getAccessToken())
+                            .setAccessTokenExpiryDate(UtilityDate.toLocalDateTime(claims.getExpiration()))
+                            .setRefreshToken(response.getRefreshToken())
+                            .setRefreshTokenExpiryDate(response.getExpiryDate());
+
+                    SettingsManager.update();
+                } catch (UnauthorizedAccessException uae) {
+                    // Crea una risposta 401 manualmente
+                    return new Response.Builder()
+                            .request(originalRequest)
+                            .protocol(Protocol.HTTP_1_1)
+                            .code(401)
+                            .message("Unauthorized")
+                            .body(ResponseBody.create(new byte[0], null))
+                            .build();
+                } catch (Exception e) {
+                    return chain.proceed(originalRequest);
+                }
+
+
+                // Add the access token to the request header
+                var authorizedRequest = originalRequest.newBuilder()
+                        .header("Authorization", "Bearer " + SettingsManager.i().getUserSession().getAccessToken())
+                        .build();
+
+                return chain.proceed(authorizedRequest);
+            } else
+                return chain.proceed(originalRequest);
+        } else
+            return chain.proceed(originalRequest);
+    }
+
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java
index 17f82459..db1cda35 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java
@@ -1,10 +1,9 @@
 package it.integry.integrywmsnative.core.rest;
 
-import android.util.Base64;
-
 import java.io.IOException;
 
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
 import okhttp3.Request;
@@ -20,25 +19,33 @@ public class HttpInterceptor implements Interceptor {
     public Response intercept(Chain chain) throws IOException {
 
         final String PROFILE_DB     = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB();
-        final String USERNAME       = SettingsManager.i().getUser().getUsername();
-        final String PASSWORD       = SettingsManager.i().getUser().getPassword();
-        final String DEVICE_ID      = SettingsManager.i().getUserSession().getDeviceId();
+        final String APP_TOKEN      = "fa3a21af-606b-4129-a22b-aedc2a52c7b6";
 
         final Request request = chain.request();
         final HttpUrl url = request.url().newBuilder()
                 .addQueryParameter("profileDb", PROFILE_DB)
                 .build();
 
-        String string = "Basic " + Base64.encodeToString((USERNAME + ":" + PASSWORD).getBytes(), Base64.NO_WRAP);
-
-        final Request newRequest = chain.request().newBuilder()
-                .addHeader("Authorization", string)
+        Request.Builder builder = chain.request().newBuilder()
                 .addHeader("Content-Type", "application/json")
                 .addHeader("Accept", "*/*")
-                .addHeader("username", USERNAME != null ? USERNAME : "")
-                .addHeader("password", PASSWORD != null ? PASSWORD : "")
-                .addHeader("device_id", DEVICE_ID != null ? DEVICE_ID : "")
-                .url(url).build();
+                .addHeader("x-app-token", APP_TOKEN);
+
+
+        String accessToken = null;
+
+        //Nel caso in cui il token è scaduto e devo richiamare la refresh non bisogna passare il vecchio token
+        if(SettingsManager.i().getUserSession().getAccessTokenExpiryDate() != null &&
+                UtilityDate.getNowTime().isBefore(SettingsManager.i().getUserSession().getAccessTokenExpiryDate())) {
+            accessToken = SettingsManager.i().getUserSession().getAccessToken();
+        }
+
+        if(accessToken != null)
+            builder.header("Authorization", "Bearer " + accessToken);
+
+        var newRequest = builder
+                .url(url)
+                .build();
 
         return chain.proceed(newRequest);
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java
index 2259ec57..9a8a1749 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java
@@ -6,6 +6,7 @@ import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Singleton;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
@@ -20,37 +21,47 @@ import retrofit2.converter.gson.GsonConverterFactory;
  * Created by GiuseppeS on 06/03/2018.
  */
 
+@Singleton
 public class RESTBuilder {
 
-    private static final boolean ADD_LOGGER_INTERCEPTOR = false;
+    private final boolean ADD_LOGGER_INTERCEPTOR = false;
+    private final AuthInterceptor authInterceptor;
 
-    public static <T> T getService(final Class<T> service) {
+    public RESTBuilder(AuthInterceptor authInterceptor) {
+        this.authInterceptor = authInterceptor;
+    }
+
+    public <T> T getService(final Class<T> service) {
         return getService(service, SettingsManager.i().getServer().getProtocol(), SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true);
 
     }
 
-    public static <T> T getService(final Class<T> service, int timeout) {
+    public <T> T getService(final Class<T> service, int timeout) {
         return getService(service, SettingsManager.i().getServer().getProtocol(), SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true, true, timeout);
 
     }
 
-    public static <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors) {
+    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors) {
         return getService(service, protocol, host, port, addInterceptors, true, 60);
     }
 
-    public static <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors, boolean addEmsApi) {
+    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors, boolean addEmsApi) {
         return getService(service, protocol, host, port, addInterceptors, addEmsApi, 60);
     }
 
-    public static <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors, boolean addEmsApi, int timeout) {
+    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors, boolean addEmsApi, int timeout) {
         OkHttpClient.Builder clientBuilder = getDefaultHttpClient();
 
+        timeout = 0;
+
         clientBuilder.connectTimeout(timeout, TimeUnit.SECONDS);
         clientBuilder.readTimeout(timeout, TimeUnit.SECONDS);
         clientBuilder.writeTimeout(timeout, TimeUnit.SECONDS);
+        clientBuilder.callTimeout(timeout, TimeUnit.SECONDS);
 
         clientBuilder.retryOnConnectionFailure(true);
 
+        clientBuilder.addInterceptor(authInterceptor);
         if (addInterceptors) clientBuilder.addInterceptor(new HttpInterceptor());
         if (ADD_LOGGER_INTERCEPTOR) clientBuilder.addInterceptor(new HttpLoggerInterceptor());
 
@@ -71,15 +82,6 @@ public class RESTBuilder {
     }
 
 
-    public static String getDefaultHost() {
-        return SettingsManager.i().getServer().getHost();
-    }
-
-    public static int getDefaultPort() {
-        return SettingsManager.i().getServer().getPort();
-    }
-
-
     public static OkHttpClient.Builder getDefaultHttpClient() {
         TrustManager[] trustAllCerts = new TrustManager[]{
                 new X509TrustManager() {
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..17a960b3 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
@@ -10,6 +10,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
 
 import javax.inject.Singleton;
 
@@ -19,93 +22,98 @@ 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;
 import it.integry.integrywmsnative.core.rest.model.articolo.SaveArticoloRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.SaveArticoloResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.UpdateBarcodeImballoRequestDTO;
 import it.integry.integrywmsnative.core.utility.UtilityQuery;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
 public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+    private final ExecutorService executorService;
     private final SystemRESTConsumer systemRESTConsumer;
 
-    public ArticoloRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+    public ArticoloRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService, SystemRESTConsumer systemRESTConsumer) {
+        this.restBuilder = restBuilder;
+        this.executorService = executorService;
         this.systemRESTConsumer = systemRESTConsumer;
     }
 
 
     public void retrieveAvailableUntMis(RunnableArgs<List<MtbUntMis>> onComplete, RunnableArgs<Exception> onFailed) {
-        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     public void retrieveAvailableGruppiMerceologici(RunnableArgs<List<MtbGrup>> onComplete, RunnableArgs<Exception> onFailed) {
-        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
-    public void searchByBarcode(String barcodeProd, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
-        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+    public List<MtbAart> searchByBarcodeSynchronized(String barcodeProd) throws Exception {
+        ArticoloRESTConsumerService articoloRESTConsumerService = restBuilder.getService(ArticoloRESTConsumerService.class);
 
         var request = new SearchArticoloByBarcodeRequestDTO()
                 .setBarcode(barcodeProd)
                 .setOnlyActive(true);
 
-        articoloRESTConsumerService
+        var response = articoloRESTConsumerService
                 .searchByBarcode(request)
-                .enqueue(new Callback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> call, Response<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> response) {
-                        analyzeAnswer(response, "searchByBarcode", (m) -> {
-                            onComplete.run(response.body().getDto().getArts());
-                        }, onFailed);
-                    }
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
-                    }
-                });
+        analyzeAnswer(response, "searchByBarcode");
+        return response.body().getDto().getArts();
+    }
+
+    public void searchByBarcode(String barcodeProd, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var mtbAarts = searchByBarcodeSynchronized(barcodeProd);
+                if (onComplete != null) onComplete.run(mtbAarts);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
     }
 
     public void findIfIsKit(MtbAart mtbAart, RunnableArgs<MtbAart> onComplete, RunnableArgs<Exception> onFailed){
-        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+        ArticoloRESTConsumerService articoloRESTConsumerService = restBuilder.getService(ArticoloRESTConsumerService.class);
 
         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,56 +122,54 @@ 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);
                     }
                 });
     }
 
+    public List<MtbAart> getByCodMartsSynchronized(List<String> codMartToFind) throws Exception {
+        var codMarts = codMartToFind.parallelStream()
+                .filter(Objects::nonNull)
+                .distinct()
+                .collect(Collectors.toUnmodifiableList());
+
+        ArticoloRESTConsumerService articoloRESTConsumer = restBuilder.getService(ArticoloRESTConsumerService.class);
+        var response = articoloRESTConsumer
+                .getByCodMart(new RetrieveArticoloByCodMartRequestDTO()
+                        .setCodMarts(codMarts))
+                .execute();
+        return analyzeAnswer(response, "getByCodMart");
+    }
+
     public void getByCodMarts(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
-        getByCodMartsStatic(codMartToFind, onComplete, onFailed);
+        executorService.execute(() -> {
+            try {
+                var mtbAarts = getByCodMartsSynchronized(codMartToFind);
+                if (onComplete != null) onComplete.run(mtbAarts);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
     }
 
-    public static void getByCodMartsStatic(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
-
-        var codMarts = Stream.of(codMartToFind)
-                .withoutNulls()
-                .distinct().toList();
-
-
-        ArticoloRESTConsumerService articoloRESTConsumer = RESTBuilder.getService(ArticoloRESTConsumerService.class);
-        articoloRESTConsumer
-                .getByCodMart(new RetrieveArticoloByCodMartRequestDTO()
-                        .setCodMarts(codMarts))
-                .enqueue(new Callback<>() {
-                    @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 List<StatoArticoloDTO> getStatoPartitaSynchronized(String codMart, String partitaMag) throws Exception {
+        ArticoloRESTConsumerService articoloRESTConsumer = restBuilder.getService(ArticoloRESTConsumerService.class);
+        var response = articoloRESTConsumer.getStatoPartita(codMart, partitaMag).execute();
 
+        var data = analyzeAnswer(response, "getStatoPartita");
+        return data;
     }
 
     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<>() {
-            @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));
+        executorService.execute(() -> {
+            try {
+                var response = getStatoPartitaSynchronized(codMart, partitaMag);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
             }
         });
-
     }
 
 
@@ -175,7 +181,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void getArtsGroups(List<String> groupsToFind, RunnableArgs<List<MtbGrup>> onComplete, RunnableArgs<Exception> onFailed) {
+    public List<MtbGrup> getArtsGroupsSynchronized(List<String> groupsToFind) throws Exception {
         var whereCondMap = Stream.of(groupsToFind)
                 .map(x -> {
                     HashMap<String, Object> vars = new HashMap<>();
@@ -189,7 +195,18 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
         Type typeOfObjectsList = new TypeToken<ArrayList<MtbGrup>>() {
         }.getType();
 
-        this.systemRESTConsumer.processSql("SELECT * FROM mtb_grup " + whereCond, typeOfObjectsList, onComplete, onFailed);
+        return this.systemRESTConsumer.processSqlSynchronized("SELECT * FROM mtb_grup " + whereCond, typeOfObjectsList);
+    }
+
+    public void getArtsGroups(List<String> groupsToFind, RunnableArgs<List<MtbGrup>> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var data = getArtsGroupsSynchronized(groupsToFind);
+                if (onComplete != null) onComplete.run(data);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
     }
 
 
@@ -242,7 +259,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
 
     public void updateBarcodeImballo(String codMart, String newBarcodeImballo, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+        ArticoloRESTConsumerService articoloRESTConsumerService = restBuilder.getService(ArticoloRESTConsumerService.class);
 
         var request = new UpdateBarcodeImballoRequestDTO()
                 .setCodMart(codMart)
@@ -250,7 +267,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,22 +276,22 @@ 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);
                     }
                 });
     }
 
 
     public void saveArticolo(ArticoloDTO articoloToSave, RunnableArgs<String> onComplete, RunnableArgs<Exception> onFailed) {
-        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+        ArticoloRESTConsumerService articoloRESTConsumerService = restBuilder.getService(ArticoloRESTConsumerService.class);
 
         var request = new SaveArticoloRequestDTO()
                 .setArtToSave(articoloToSave);
 
         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 +300,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..2680ef36 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,29 +1,37 @@
 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
 public class AziendaRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
+    public AziendaRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
+
     public void retrieveAzienda(RunnableArgs<Azienda> onComplete, RunnableArgs<Exception> onFailed) {
-        AziendaRESTConsumerService aziendaRESTConsumerService = RESTBuilder.getService(AziendaRESTConsumerService.class);
-        aziendaRESTConsumerService.retrieveDefaultAzienda().enqueue(new Callback<>() {
+        AziendaRESTConsumerService aziendaRESTConsumerService = restBuilder.getService(AziendaRESTConsumerService.class);
+        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/BarcodeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java
index 51474031..cb781a56 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java
@@ -16,6 +16,10 @@ public class BarcodeRESTConsumer extends _BaseRESTConsumer {
         this.ean128Service = ean128Service;
     }
 
+    public Ean128Model decodeEan128Synchronized(BarcodeScanDTO barcodeScanDTO) throws Exception {
+        return this.ean128Service.decode(barcodeScanDTO);
+    }
+
     public void decodeEan128(BarcodeScanDTO barcodeObj, RunnableArgs<Ean128Model> onComplete, RunnableArgs<Exception> onFailed) {
         try {
             onComplete.run(this.ean128Service.decode(barcodeObj));
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..dbfaa782 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,25 +21,30 @@ 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
 public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements ColliCaricoRESTConsumerInterface {
 
+    private final RESTBuilder restBuilder;
+
+    public ColliAccettazioneRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
+
     public void createUDC(CreateUDCRequestDTO createUDCRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+        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);
                     }
                 });
 
@@ -44,89 +52,89 @@ public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements
 
     @Override
     public void closeUDC(CloseUDCRequestDTO closeUDCRequestDTO, RunnableArgs<CloseUDCResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     @Override
     public void insertUDCRow(InsertUDCRowRequestDTO insertUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     @Override
     public void editUDCRow(EditUDCRowRequestDTO editUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     @Override
     public void deleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRowRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     public void checkBarcodeUl(String barcodeUl, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed){
-        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+        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..9a708bb4 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,104 +37,105 @@ 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
 public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements ColliCaricoRESTConsumerInterface, ColliScaricoRESTConsumerInterface {
 
 
+    private final RESTBuilder restBuilder;
     private final SettingsManager settingsManager;
 
-    public ColliLavorazioneRESTConsumer(SettingsManager settingsManager) {
+    public ColliLavorazioneRESTConsumer(RESTBuilder restBuilder, SettingsManager settingsManager) {
+        this.restBuilder = restBuilder;
         this.settingsManager = settingsManager;
     }
 
     @Override
     public void createUDC(CreateUDCRequestDTO createUDCRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     @Override
     public void closeUDC(CloseUDCRequestDTO closeUDCRequestDTO, RunnableArgs<CloseUDCResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     @Override
     public void insertUDCRow(InsertUDCRowRequestDTO insertUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     @Override
     public void editUDCRow(EditUDCRowRequestDTO editUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     public void createUDS(CreateUDSRequestDTO createUDSRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+        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);
                     }
                 });
 
@@ -139,89 +143,89 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
 
     @Override
     public void closeUDS(CloseUDSRequestDTO closeUDSRequestDTO, RunnableArgs<CloseUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     @Override
     public void insertUDSRow(InsertUDSRowRequestDTO insertUDSRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     public void editUDSRow(EditUDSRowRequestDTO editUDSRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     @Override
     public void deleteUDSRow(DeleteUDSRowRequestDTO deleteUDSRowRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     @Override
     public void deleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRowRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
@@ -249,18 +253,18 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
             createUDSFromArtRequestDTO
                     .setCodJfas(posizione.getPosizione());
         }
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+        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..7e3927f3 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;
@@ -15,6 +16,8 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import javax.inject.Singleton;
 
@@ -29,9 +32,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,21 +50,22 @@ 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
 public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
     private final SystemRESTConsumer mSystemRESTConsumer;
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
     private final EntityRESTConsumer mEntityRESTConsumer;
     private final SettingsManager mSettingsManager;
 
-    public ColliMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer,
+    public ColliMagazzinoRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer,
                                       ArticoloRESTConsumer articoloRESTConsumer,
                                       EntityRESTConsumer entityRESTConsumer,
                                       SettingsManager settingsManager) {
+        this.restBuilder = restBuilder;
         this.mSystemRESTConsumer = systemRESTConsumer;
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mEntityRESTConsumer = entityRESTConsumer;
@@ -81,7 +87,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);
@@ -283,8 +289,8 @@ 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 colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        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,40 +307,69 @@ 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);
             }
         });
     }
 
-    public void fillMtbAartsOfMtbColts(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
-        fillMtbAartsOfMtbColtsStatic(mtbColts, onComplete, onFailed);
+    public void fillMtbAartsOfMtbColrs(List<MtbColr> mtbColrs, RunnableArgs<List<MtbColr>> onComplete, RunnableArgs<Exception> onFailed) {
+
+        List<String> codMarts = new ArrayList<>(mtbColrs.stream()
+                .map(MtbColr::getCodMart)
+                .filter(Objects::nonNull)
+                .distinct()
+                .collect(Collectors.toUnmodifiableList()));
+
+        mArticoloRESTConsumer.getByCodMarts(codMarts, arts -> {
+
+            if (arts != null && !arts.isEmpty()) {
+                for (MtbColr mtbColr : mtbColrs) {
+
+                    MtbAart foundMtbAart = null;
+
+                    List<MtbAart> mtbAartStream = arts.stream()
+                            .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()))
+                            .collect(Collectors.toList());
+
+                    if (!mtbAartStream.isEmpty()) {
+                        foundMtbAart = mtbAartStream.get(0);
+                    }
+
+                    mtbColr.setMtbAart(foundMtbAart);
+                }
+            }
+
+            onComplete.run(mtbColrs);
+        }, onFailed);
+
     }
 
-    public static void fillMtbAartsOfMtbColtsStatic(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void fillMtbAartsOfMtbColts(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         List<String> codMarts = new ArrayList<>();
 
         for (MtbColt mtbColt : mtbColts) {
-            codMarts.addAll(Stream.of(mtbColt.getMtbColr())
+            codMarts.addAll(mtbColt.getMtbColr().stream()
                     .map(MtbColr::getCodMart)
-                    .withoutNulls()
+                    .filter(Objects::nonNull)
                     .distinct()
-                    .toList());
+                    .collect(Collectors.toUnmodifiableList()));
         }
 
 
-        ArticoloRESTConsumer.getByCodMartsStatic(codMarts, arts -> {
+        mArticoloRESTConsumer.getByCodMarts(codMarts, arts -> {
 
-            if (arts != null && arts.size() > 0) {
+            if (arts != null && !arts.isEmpty()) {
                 for (MtbColt mtbColt : mtbColts) {
                     for (MtbColr mtbColr : mtbColt.getMtbColr()) {
 
                         MtbAart foundMtbAart = null;
 
-                        List<MtbAart> mtbAartStream = Stream.of(arts)
-                                .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart())).toList();
+                        List<MtbAart> mtbAartStream = arts.stream()
+                                .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()))
+                                .collect(Collectors.toList());
 
-                        if (mtbAartStream != null && mtbAartStream.size() > 0) {
+                        if (!mtbAartStream.isEmpty()) {
                             foundMtbAart = mtbAartStream.get(0);
                         }
 
@@ -383,28 +418,29 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         testata.setMtbColr(new ObservableArrayList<>());
 
 
-        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 colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        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) {
@@ -422,10 +458,10 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                 .setMtbColtsToMove(Collections.singletonList(mtbColtToMoveClone))
                 .setCreateDocAutomatically(createDocAutomatically);
 
-        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        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 +470,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);
                     }
                 });
     }
@@ -457,10 +493,10 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                 .setMtbColt(mtbColtClone)
                 .setCodTcol(codTcol);
 
-        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        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 +505,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);
                     }
                 });
 
@@ -492,19 +528,19 @@ 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>>>() {
+    public void retrieveBasketColli(RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        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 -> {
-                    fillMtbAartsOfMtbColtsStatic(mtbColts, onComplete, onFailed);
+                    fillMtbAartsOfMtbColts(mtbColts, onComplete, onFailed);
                 }, onFailed);
             }
 
             @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);
             }
         });
     }
@@ -519,24 +555,24 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                 .setNewNumCnf(newNumCnf)
                 .setNewQtaCol(newQtaTot);
 
-        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
         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 +587,23 @@ 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 colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+            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();
+
+                        fillMtbAartsOfMtbColrs(data.getGeneratedMtbColr(), onComplete, onFailed);
+
                     }, 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();
@@ -579,8 +618,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                     .setMtbPartitaMag(null);
         }
 
-        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.assegnaLottoSuColloScarico(sourceMtbColtClone).enqueue(new Callback<>() {
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService.assegnaLottoSuColloScarico(sourceMtbColtClone).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
                 analyzeAnswer(response, "assegnaLottoSuColloScarico", data -> {
@@ -589,8 +628,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);
             }
         });
     }
@@ -604,8 +643,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                     .setMtbPartitaMag(null);
         }
 
-        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.versamentoAutomaticoUL(sourceMtbColtClone).enqueue(new Callback<>() {
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService.versamentoAutomaticoUL(sourceMtbColtClone).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> call, Response<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> response) {
                 analyzeAnswer(response, "versamentoAutomaticoUL", data -> {
@@ -642,8 +681,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);
             }
         });
     }
@@ -652,8 +691,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         MtbColt sourceMtbColtClone = (MtbColt) sourceMtbColt.clone();
         sourceMtbColtClone.setMtbColr(new ObservableArrayList<>());
 
-        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.confirmGiacenzaUL(sourceMtbColtClone).enqueue(new Callback<>() {
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService.confirmGiacenzaUL(sourceMtbColtClone).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                 analyzeAnswer(response, "confirmGiacenzaUL", data -> {
@@ -663,8 +702,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);
             }
         });
     }
@@ -700,36 +739,36 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         CanULBeDeletedRequestDTO canULBeDeletedRequestDTO = new CanULBeDeletedRequestDTO()
                 .setMtbColt(mtbColt);
 
-        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        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);
                     }
                 });
 
     }
 
     public void deleteUL(DeleteULRequestDTO deleteULRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        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);
                     }
                 });
 
@@ -741,18 +780,18 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             return;
         }
 
-        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        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..4744758f 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,113 +23,117 @@ 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
 public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements ColliScaricoRESTConsumerInterface {
 
+    private final RESTBuilder restBuilder;
+
+    public ColliSpedizioneRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
 
     public void createUDS(CreateUDSRequestDTO createUDSRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
+        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);
                     }
                 });
 
     }
 
     public void closeUDS(CloseUDSRequestDTO closeUDSRequestDTO, RunnableArgs<CloseUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
+        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);
                     }
                 });
 
     }
 
     public void insertUDSRow(InsertUDSRowRequestDTO insertUDSRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     public void editUDSRow(EditUDSRowRequestDTO editUDSRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     public void deleteUDSRow(DeleteUDSRowRequestDTO deleteUDSRowRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
+        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);
                     }
                 });
 
     }
 
     public void duplicateUDS(DuplicateUDSRequestDTO duplicateUDSRequestDTO, RunnableArgs<DuplicateUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
+        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..4841f3ef 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,75 +9,80 @@ 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
 public class DocumentRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
+    public DocumentRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
 
     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 documentiRESTConsumerService = restBuilder.getService(DocumentiRESTConsumerService.class);
+        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 documentiRESTConsumerService = restBuilder.getService(DocumentiRESTConsumerService.class);
+        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);
             }
         });
     }
 
     public void checkDocument(String fornitore, String numDoc, String dataDoc, String tipoDoc, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
-        var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     public void loadDocumentAvailableArts(String codDtip, String codMgrp, String codAnagForn, RunnableArgs<RetrieveDocumentoArtsResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
+        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..964043b2 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,16 +15,21 @@ 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
 public class EntityRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
+    public EntityRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
 
     public <T extends EntityBase> void processEntity(T entityToSave, final ISimpleOperationCallback<T> callback, Class<T> type) {
 
@@ -30,10 +37,10 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
             if (callback != null) callback.onFailed(ex);
         };
 
-        EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class);
+        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 +66,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);
                     }
                 });
 
@@ -74,9 +80,9 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
             if (onFailed != null) onFailed.run(ex);
         };
 
-        EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class);
+        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 +118,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);
             }
         });
 
@@ -124,9 +129,9 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
     @Deprecated
     public <T extends EntityBase> void selectEntity(T entityToSave, final ISimpleOperationCallback<List<T>> callback, Class type) {
 
-        EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class);
+        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 +141,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 +168,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..1af0b430 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,32 +10,35 @@ 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
 public class GestSetupRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
+    public GestSetupRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
+
     public void getValue(String gestName, String sectionName, String keySection, RunnableArgs<GestSetupDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        GestSetupRESTConsumerService service = RESTBuilder.getService(GestSetupRESTConsumerService.class);
+        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);
                     }
                 });
     }
@@ -51,18 +54,16 @@ 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>>() {
+        GestSetupRESTConsumerService service = restBuilder.getService(GestSetupRESTConsumerService.class);
+        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);
             }
         });
     }
@@ -81,8 +82,8 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
     public void getValues(String codMdep, List<StbGestSetupReader> stbGestSetupList, RunnableArgs<List<StbGestSetupReader>> onComplete, RunnableArgs<Exception> onFailed) {
         var stbGestSetups = stbGestSetupList.stream().map(x -> (StbGestSetup) x).collect(Collectors.toList());
 
-        GestSetupRESTConsumerService service = RESTBuilder.getService(GestSetupRESTConsumerService.class);
-        service.getGestSetupValues(codMdep, stbGestSetups).enqueue(new Callback<>() {
+        GestSetupRESTConsumerService service = restBuilder.getService(GestSetupRESTConsumerService.class);
+        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 +101,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/GiacenzaPvRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumer.java
new file mode 100644
index 00000000..e755444a
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumer.java
@@ -0,0 +1,41 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.pv.GiacenzaPvDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.SaveNewVerificaRequestDTO;
+
+public class GiacenzaPvRESTConsumer extends _BaseRESTConsumer {
+
+
+    private final RESTBuilder restBuilder;
+    private final ExecutorService executorService;
+
+    public GiacenzaPvRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        this.restBuilder = restBuilder;
+        this.executorService = executorService;
+    }
+
+
+    public List<GiacenzaPvDTO> retrieveGiacenzeSynchronized(String codMdep) throws Exception {
+        GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 120);
+        var response = giacenzaPvRESTConsumerService.retrieve(codMdep)
+                .execute();
+
+        var giacenzeList = analyzeAnswer(response, "retrieve-giacenze-pv");
+
+        return giacenzeList != null ? giacenzeList : new ArrayList<>();
+    }
+
+    public void saveNewVerificaSynchronized(SaveNewVerificaRequestDTO saveNewVerificaRequest) throws Exception {
+        GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0);
+        var response = giacenzaPvRESTConsumerService.saveNewVerifica(saveNewVerificaRequest)
+                .execute();
+
+        analyzeAnswer(response, "save-verifica-pv");
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java
new file mode 100644
index 00000000..4bb86b7c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java
@@ -0,0 +1,22 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.pv.GiacenzaPvDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.SaveNewVerificaRequestDTO;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.Query;
+
+public interface GiacenzaPvRESTConsumerService {
+
+    @GET("giacenza/retrieve")
+    Call<ServiceRESTResponse<List<GiacenzaPvDTO>>> retrieve(@Query("codMdep") String codMdep);
+
+
+    @POST("wms/pv/verifica_giacenze/save_new_verifica")
+    Call<ServiceRESTResponse<Void>> saveNewVerifica(@Body SaveNewVerificaRequestDTO saveNewVerificaRequest);
+}
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..83506ee8 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,10 +1,14 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
 
 import javax.inject.Singleton;
 
@@ -13,70 +17,75 @@ 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
 public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+    private final ExecutorService executorService;
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
 
-    public GiacenzaRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
+    public GiacenzaRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService, ArticoloRESTConsumer articoloRESTConsumer) {
+        this.restBuilder = restBuilder;
+        this.executorService = executorService;
         this.mArticoloRESTConsumer = articoloRESTConsumer;
 
     }
 
-    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<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, Response<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> response) {
-                analyzeAnswer(response, "getGiacenzeInPosizione", inventarioList -> {
+    public List<MvwSitArtUdcDetInventario> getGiacenzeInPosizioneSynchronized(MtbDepoPosizione posizione) throws Exception {
+        GiacenzaRESTConsumerService giacenzaRESTConsumerService = restBuilder.getService(GiacenzaRESTConsumerService.class);
+        var response = giacenzaRESTConsumerService.retrieveAvailableItems(posizione.getPosizione())
+                .execute();
 
-                    if(inventarioList != null && !inventarioList.isEmpty()){
-                        List<String> codMarts = Stream.of(inventarioList)
-                                .map(x -> x.getCodMart().trim())
-                                .toList();
+        var inventarioList = analyzeAnswer(response, "getGiacenzeInPosizione");
 
-                        mArticoloRESTConsumer.getByCodMarts(codMarts, mtbAarts -> {
-                            for (var row : inventarioList) {
+        if (inventarioList != null && !inventarioList.isEmpty()) {
+            List<String> codMarts = inventarioList.stream()
+                    .map(x -> x.getCodMart().trim())
+                    .collect(Collectors.toList());
 
-                                MtbAart foundMtbAart = null;
-                                Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
-                                        .filter(x -> x.getCodMart().equalsIgnoreCase(row.getCodMart()))
-                                        .findFirst();
+            var mtbAarts = mArticoloRESTConsumer.getByCodMartsSynchronized(codMarts);
+            for (var row : inventarioList) {
+                MtbAart foundMtbAart = null;
+                Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
+                        .filter(x -> x.getCodMart().equalsIgnoreCase(row.getCodMart()))
+                        .findFirst();
 
-                                if (mtbAartOpt.isPresent()) {
-                                    foundMtbAart = mtbAartOpt.get();
-                                }
+                if (mtbAartOpt.isPresent()) {
+                    foundMtbAart = mtbAartOpt.get();
+                }
 
-                                row.setMtbAart(foundMtbAart);
-                            }
-
-                            onComplete.run(inventarioList);
-                        }, onFailed);
-                    }else{
-                        onComplete.run(new ArrayList<>());
-                    }
-                }, onFailed);
+                row.setMtbAart(foundMtbAart);
             }
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
+            return inventarioList;
+        }
+
+        return new ArrayList<>();
+    }
+
+    public void getGiacenzeInPosizione(MtbDepoPosizione posizione, RunnableArgs<List<MvwSitArtUdcDetInventario>> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var result = getGiacenzeInPosizioneSynchronized(posizione);
+                if (onComplete != null) onComplete.run(result);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
             }
         });
     }
 
     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 giacenzaRESTConsumerService = restBuilder.getService(GiacenzaRESTConsumerService.class);
+        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 -> {
@@ -88,8 +97,8 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
                     mArticoloRESTConsumer.getByCodMarts(codMarts, mtbAarts -> {
                         for (var articoli : inventarioList) {
                             List<MvwSitArtUdcDetInventario> mvwSitArtUdcDetInventario = articoli.getMvwSitArtUdcDetInventarioDTO();
-                            if (mvwSitArtUdcDetInventario != null && !mvwSitArtUdcDetInventario.isEmpty()){
-                                for (var row : mvwSitArtUdcDetInventario){
+                            if (mvwSitArtUdcDetInventario != null && !mvwSitArtUdcDetInventario.isEmpty()) {
+                                for (var row : mvwSitArtUdcDetInventario) {
                                     MtbAart foundMtbAart = null;
                                     Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
                                             .filter(x -> x.getCodMart().equalsIgnoreCase(row.getCodMart()))
@@ -110,19 +119,19 @@ 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);
             }
         });
     }
 
     public void getGiacenzeByArticolo(String codMart, String partitaMag, RunnableArgs<List<MvwSitArtUdcDetInventario>> onComplete, RunnableArgs<Exception> onFailed) {
-        GiacenzaRESTConsumerService giacenzaRESTConsumerService = RESTBuilder.getService(GiacenzaRESTConsumerService.class);
+        GiacenzaRESTConsumerService giacenzaRESTConsumerService = restBuilder.getService(GiacenzaRESTConsumerService.class);
         var serviceRESTResponseCall =
                 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,18 +162,18 @@ 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 getInstantItemSituation(String codMdep, String codMart, String partitaMag, String codJcom, RunnableArgs<InstantItemSituationResponseDto> onComplete, RunnableArgs<Exception> onFailed) {
-        GiacenzaRESTConsumerService giacenzaRESTConsumerService = RESTBuilder.getService(GiacenzaRESTConsumerService.class);
+        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 +183,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/ImballiRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java
index 9170d032..2116fdfa 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java
@@ -20,15 +20,17 @@ import retrofit2.Response;
 @Singleton
 public class ImballiRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
     private final ExecutorService executorService;
 
-    public ImballiRESTConsumer(ExecutorService executorService) {
+    public ImballiRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        this.restBuilder = restBuilder;
         this.executorService = executorService;
     }
 
 
     public List<ObservableMtbTcol> retrieveImballiSyncronized(MtbTCol.FlagUiUlEnum tipoImballo) throws Exception {
-        ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
+        ImballiRESTConsumerService service = restBuilder.getService(ImballiRESTConsumerService.class);
         Response<ServiceRESTResponse<List<MtbTCol>>> response = service.retrieveImballi(tipoImballo)
                 .execute();
 
@@ -50,7 +52,7 @@ public class ImballiRESTConsumer extends _BaseRESTConsumer {
 
 
     public void registraCaricoSyncronized(String codAnag, List<ImballoQuantityDTO> imballi) throws Exception {
-        ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
+        ImballiRESTConsumerService service = restBuilder.getService(ImballiRESTConsumerService.class);
         Response<ServiceRESTResponse<Void>> response = service.registraCarico(
                         new RegistraCaricoImballiRequestDTO()
                                 .setCodAnag(codAnag)
@@ -73,7 +75,7 @@ public class ImballiRESTConsumer extends _BaseRESTConsumer {
 
 
     public void registraScaricoSyncronized(String codVettore, List<ImballoQuantityDTO> imballi) throws Exception {
-        ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
+        ImballiRESTConsumerService service = restBuilder.getService(ImballiRESTConsumerService.class);
         Response<ServiceRESTResponse<Void>> response = service.registraScarico(
                         new RegistraScaricoImballiRequestDTO()
                                 .setCodVettore(codVettore)
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..cd821d26 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
@@ -4,58 +4,65 @@ import androidx.annotation.NonNull;
 
 import java.util.List;
 
+import javax.inject.Inject;
 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
 public class InventarioRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
+    @Inject
+    public InventarioRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
 
     public void loadInventario(long inventoryId, RunnableArgs<RetrieveInventarioResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        var inventarioRESTConsumerService = RESTBuilder.getService(InventarioRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
 
     public void loadInventarioArts(long inventoryId, RunnableArgs<RetrieveInventarioArtsResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        var inventarioRESTConsumerService = RESTBuilder.getService(InventarioRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     public List<MtbInvent> makeSynchronousRetrieveRequest() throws Exception {
-        var inventarioRESTConsumerService = RESTBuilder.getService(InventarioRESTConsumerService.class, 120);
+        var inventarioRESTConsumerService = restBuilder.getService(InventarioRESTConsumerService.class, 120);
 
         var response = inventarioRESTConsumerService.retrieve()
                 .execute();
@@ -70,18 +77,18 @@ public class InventarioRESTConsumer extends _BaseRESTConsumer {
         var request = new InsertInventarioRequestDTO()
                 .setMtbInvent(inventarioToInsert);
 
-        var inventarioRESTConsumerService = RESTBuilder.getService(InventarioRESTConsumerService.class, 300);
+        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..c938a532 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,32 +1,41 @@
 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
 public class MagazzinoAutomaticoRESTConsumer extends _BaseRESTConsumer {
 
+
+    private final RESTBuilder restBuilder;
+
+    public MagazzinoAutomaticoRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
+
     public void pickItems(MtbDepoPosizione posizione, MagazzinoAutomaticoPickItemsRequestDTO magazzinoAutomaticoPickItemsRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        MagazzinoAutomaticoRESTConsumerService magazzinoAutomaticoRESTConsumerService = RESTBuilder.getService(MagazzinoAutomaticoRESTConsumerService.class);
+        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);
                     }
                 });
 
@@ -34,17 +43,17 @@ public class MagazzinoAutomaticoRESTConsumer extends _BaseRESTConsumer {
 
 
     public void putItems(MtbDepoPosizione posizione, MagazzinoAutomaticoPutItemsRequestDTO magazzinoAutomaticoPutItemsRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        MagazzinoAutomaticoRESTConsumerService magazzinoAutomaticoRESTConsumerService = RESTBuilder.getService(MagazzinoAutomaticoRESTConsumerService.class);
+        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..0a9804a8 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,64 +1,72 @@
 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
 public class MagazzinoBufferRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
+    public MagazzinoBufferRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
+
     public void isVersamentoStarted(MtbDepoPosizione posizione, MagazzinoBufferVersamentoMaterialeRequestDTO magazzinoBufferVersamentoMaterialeRequestDTO, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
-        MagazzinoBufferRESTConsumerService magazzinoBufferRESTConsumerService = RESTBuilder.getService(MagazzinoBufferRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     public void startVersamentoMateriale(MtbDepoPosizione posizione, MagazzinoBufferVersamentoMaterialeRequestDTO magazzinoBufferVersamentoMaterialeRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        MagazzinoBufferRESTConsumerService magazzinoBufferRESTConsumerService = RESTBuilder.getService(MagazzinoBufferRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     public void endVersamentoMateriale(MtbDepoPosizione posizione, MagazzinoBufferVersamentoMaterialeCloseRequestDTO magazzinoBufferVersamentoMaterialeCloseRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        MagazzinoBufferRESTConsumerService magazzinoBufferRESTConsumerService = RESTBuilder.getService(MagazzinoBufferRESTConsumerService.class);
+        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..de3080b8 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,46 +9,47 @@ 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
 public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
     private final ExecutorService executorService;
-    private final SystemRESTConsumer mSystemRESTConsumer;
+    private final SystemRESTConsumer systemRESTConsumer;
 
-    public MagazzinoRESTConsumer(ExecutorService executorService, SystemRESTConsumer mSystemRESTConsumer) {
+    public MagazzinoRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService, SystemRESTConsumer systemRESTConsumer) {
+        this.restBuilder = restBuilder;
         this.executorService = executorService;
-        this.mSystemRESTConsumer = mSystemRESTConsumer;
+        this.systemRESTConsumer = systemRESTConsumer;
     }
 
     public void saveTerminalinoWMS(SaveDTO saveDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
 
     public MtbPartitaMag retrievePartitaMagSyncronized(String partitaMag, String codMart) throws Exception {
-        MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class);
+        MagazzinoRESTConsumerService service = restBuilder.getService(MagazzinoRESTConsumerService.class);
         Response<ServiceRESTResponse<MtbPartitaMag>> response = service.retrievePartitaMag(codMart, partitaMag)
                 .execute();
 
@@ -67,17 +68,17 @@ 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);
+        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..da79b417
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumer.java
@@ -0,0 +1,46 @@
+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 RESTBuilder restBuilder;
+    private final ExecutorService executorService;
+
+    public MaterialiRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        this.restBuilder = restBuilder;
+        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..eb346382 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,71 +13,72 @@ 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
 public class MesRESTConsumer extends _BaseRESTConsumer {
 
-    private final SystemRESTConsumer mSystemRESTConsumer;
+    private final RESTBuilder restBuilder;
+    private final SystemRESTConsumer systemRESTConsumer;
 
-    public MesRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        this.mSystemRESTConsumer = systemRESTConsumer;
+    public MesRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        this.restBuilder = restBuilder;
+        this.systemRESTConsumer = systemRESTConsumer;
     }
 
     public void getOrdiniLavorazioneMateriale(String codJfas, String idMateriale, RunnableArgs<List<OrdineLavorazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        MesRESTConsumerService mesRESTConsumerService = RESTBuilder.getService(MesRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     public void getOrdiniLavorazione(String flagEvaso, String codJfas, String codAnag, RunnableArgs<List<OrdineLavorazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        MesRESTConsumerService mesRESTConsumerService = RESTBuilder.getService(MesRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
 
     public void getOrdiniLavorazione(String flagEvaso, RunnableArgs<List<OrdineLavorazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        MesRESTConsumerService mesRESTConsumerService = RESTBuilder.getService(MesRESTConsumerService.class);
+        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);
                     }
                 });
     }
@@ -85,7 +87,7 @@ public class MesRESTConsumer extends _BaseRESTConsumer {
 
         Type typeOfObjectsList = new TypeToken<ArrayList<JtbFasi>>() {
         }.getType();
-        this.mSystemRESTConsumer.processSql(
+        this.systemRESTConsumer.processSql(
                 "SELECT * FROM jtb_fasi WHERE cod_jfas_parent = " + UtilityDB.valueToString(codJfasParent),
                 typeOfObjectsList,
                 onComplete,
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..0aa4af9f 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,35 +23,37 @@ 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
 public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
     private final SystemRESTConsumer mSystemRESTConsumer;
     private final EntityRESTConsumer mEntityRESTConsumer;
 
-    public OrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
+    public OrdiniRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
+        this.restBuilder = restBuilder;
         this.mSystemRESTConsumer = systemRESTConsumer;
         this.mEntityRESTConsumer = entityRESTConsumer;
     }
 
     public void getSuggestedPickingList(String codMdep, List<SitArtOrdDTO> sitArtOrdList, RunnableArgs<List<PickingObjectDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);
+        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 +113,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);
                     }
                 });
 
@@ -123,10 +127,10 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
     public void getOrdiniInevasi(String codMdep, GestioneEnum gestione, RunnableArgs<List<OrdineUscitaInevasoDTO>> onComplete, RunnableArgs<Exception> onFailed) {
 
-        OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class);
+        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 +143,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);
                     }
                 });
     }
@@ -156,9 +159,9 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
                         .setIdViaggio(x.getIdViaggio()))
                 .toList();
 
-        OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);
+        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,14 +176,12 @@ 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);
             }
         });
     }
 
-
     public void getBancaliGiaRegistrati(List<OrdineInevasoDTO> orders, GestioneEnum gestione, int segno, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         String whereCondGestione = "";
 
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..60835442 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,29 +16,30 @@ 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
 public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
     private final MagazzinoRESTConsumer magazzinoRESTConsumer;
 
-    public PVOrdiniAcquistoRESTConsumer(MagazzinoRESTConsumer magazzinoRESTConsumer) {
+    public PVOrdiniAcquistoRESTConsumer(RESTBuilder restBuilder, MagazzinoRESTConsumer magazzinoRESTConsumer) {
+        this.restBuilder = restBuilder;
         this.magazzinoRESTConsumer = magazzinoRESTConsumer;
     }
 
     public void retrieveArticoli(String codAlis, String codMdep, RunnableArgs<OrdiniAcquistoGrigliaDTO> onSuccess, RunnableArgs<Exception> onFailed) {
-        PVOrdiniAcquistoRESTConsumerService ordiniARestService = RESTBuilder.getService(PVOrdiniAcquistoRESTConsumerService.class, 300);
+        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,16 +50,16 @@ 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);
                     }
                 });
     }
 
     public void retrieveArticolo(String codAlis, String codMdep, String barcode, RunnableArgs<OrdiniAcquistoGrigliaDTO> onSuccess, RunnableArgs<Exception> onFailed) {
-        PVOrdiniAcquistoRESTConsumerService ordiniARestService = RESTBuilder.getService(PVOrdiniAcquistoRESTConsumerService.class, 300);
+        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 +70,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);
                     }
                 });
     }
@@ -89,9 +92,9 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
         saveDTO.setGestione("O");
         saveDTO.setOrdineDTO(ordineDTO);
 
-        PVOrdiniAcquistoRESTConsumerService ordiniARestService = RESTBuilder.getService(PVOrdiniAcquistoRESTConsumerService.class, 300);
+        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 +116,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..59e276e1 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,26 +14,28 @@ 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
 public class PosizioniRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
     private final SystemRESTConsumer mSystemRESTConsumer;
 
-    public PosizioniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+    public PosizioniRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        this.restBuilder = restBuilder;
         this.mSystemRESTConsumer = systemRESTConsumer;
     }
 
     public void getAvailablePosizioni(RunnableArgs<List<MtbDepoPosizione>> onComplete, RunnableArgs<Exception> onFailed) {
         String codMdep = null;
 
-        PosizioniRESTConsumerService posizioniRESTConsumerService = RESTBuilder.getService(PosizioniRESTConsumerService.class);
-        posizioniRESTConsumerService.getAvailablePosizioni(codMdep).enqueue(new Callback<>() {
+        PosizioniRESTConsumerService posizioniRESTConsumerService = restBuilder.getService(PosizioniRESTConsumerService.class);
+        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 +44,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..460bc337 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,61 +1,34 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import android.util.Log;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
 import java.util.HashMap;
-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
 public class PrinterRESTConsumer extends _BaseRESTConsumer {
 
-    public enum Type {
-        PRIMARIA,
-        SECONDARIA
-    }
+    private final RESTBuilder restBuilder;
 
-
-    public void getAvailablePrinters(String codMdep, Type printerType, RunnableArgs<List<String>> onComplete, RunnableArgs<Exception> onFailed) {
-
-        String printerTypeStr = printerType != null ? printerType.toString() : null;
-
-        PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
-        printerService.getAvailablePrinters(codMdep, printerTypeStr).enqueue(new Callback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<List<String>>> call, Response<ServiceRESTResponse<List<String>>> response) {
-                analyzeAnswer(response, "GetAvailablePrinters", printerList -> {
-                    printerList = Stream.of(printerList).filter(x -> !UtilityString.isNullOrEmpty(x)).toList();
-                    onComplete.run(printerList);
-                }, onFailed);
-            }
-
-            @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 PrinterRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
     }
 
     public void printCollo(MtbColt testataColloToPrint, Runnable onComplete, RunnableArgs<Exception> onFailed) {
@@ -65,10 +38,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
             return;
         }
 
-        PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
+        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 +50,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);
                     }
                 });
     }
@@ -98,10 +69,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
         Stream.of(params)
                 .forEach(x -> jasperDTO.getParams().add(new JasperPairDTO(x.getKey(), x.getValue())));
 
-        PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
+        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 +81,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);
                     }
                 });
     }
@@ -128,10 +97,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
         Stream.of(params)
                 .forEach(x -> reportTypeDTO.getParams().add(new JasperPairDTO(x.getKey(), x.getValue())));
 
-        PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
+        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 +109,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);
                     }
                 });
     }
@@ -162,9 +129,9 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
             return;
         }
 
-        PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class, 240);
+        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 +140,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..35fc6a1c 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,19 +11,25 @@ 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
 public class ProductionLinesRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
+    public ProductionLinesRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
+
     public void avviaLineaDiProduzione(String codJfas, Integer hrNum, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class);
+        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,16 +38,16 @@ 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);
             }
         });
     }
 
     public void arrestaLineaDiProduzione(String codJfas, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class);
+        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,16 +56,16 @@ 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);
             }
         });
     }
 
     public void avviaProduzioneArticoloSuLinea(String codJfas, String codMart, String partitaMag, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class, 300);
+        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,33 +74,33 @@ 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);
             }
         });
     }
 
     public void getStatoLinee(String codMdep, RunnableArgs<List<ProdLineStatusDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class);
+        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);
             }
         });
     }
 
 
     public void getLineDetails(ProdLineStatusDTO lineaProd, RunnableArgs<ProdLineStatusDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        ProductionLinesRESTConsumerService restService = RESTBuilder.getService(ProductionLinesRESTConsumerService.class);
+        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 +110,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..b0021de3
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ProduzioneRESTConsumer.java
@@ -0,0 +1,44 @@
+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 {
+
+    private final RESTBuilder restBuilder;
+
+    public ProduzioneRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
+
+
+    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..f42791d7 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,127 +3,104 @@ 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 java.util.concurrent.ExecutorService;
 
 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;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
-import it.integry.integrywmsnative.core.rest.model.system.RegisterDeviceRequestDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityGson;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
 public class SystemRESTConsumer extends _BaseRESTConsumer {
 
+    private final ExecutorService executorService;
+    private final RESTBuilder restBuilder;
 
-    public void retrieveUpdatesInfo(final RunnableArgs<LatestAppVersionInfoDTO> onSuccess, final RunnableArgs<Exception> onFailed) {
-        SystemRESTConsumerService systemRESTConsumerService = RESTBuilder.getService(SystemRESTConsumerService.class);
-        systemRESTConsumerService.retrieveUpdatesInfo()
-                .enqueue(new Callback<>() {
-                    @Override
-                    public void onResponse(Call<LatestAppVersionInfoDTO> call, Response<LatestAppVersionInfoDTO> response) {
-                        analyzeAnswerGeneric(response, "updates", onSuccess, onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<LatestAppVersionInfoDTO> call, Throwable t) {
-                        onFailed.run(new Exception(t));
-                    }
-                });
+    public SystemRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        this.restBuilder = restBuilder;
+        this.executorService = executorService;
     }
 
+    public LatestAppVersionInfoDTO retrieveUpdatesInfoSynchronized(boolean betaVersion) throws Exception {
+        SystemRESTConsumerService systemRESTConsumerService = restBuilder.getService(SystemRESTConsumerService.class);
+        var response = systemRESTConsumerService.retrieveUpdatesInfo(betaVersion ? "beta" : null)
+                .execute();
 
-    public void registerDevice(final Runnable onSuccess, final RunnableArgs<Exception> onFailed) {
-        RegisterDeviceRequestDTO registerDeviceRequestDTO = new RegisterDeviceRequestDTO()
-                .setApp("WMS");
-
-        SystemRESTConsumerService systemRESTConsumerService = RESTBuilder.getService(SystemRESTConsumerService.class);
-        systemRESTConsumerService.registerDevice(registerDeviceRequestDTO)
-                .enqueue(new Callback<>() {
-                    @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));
-                    }
-                });
+        if (response.code() == 404) {
+            return null;
+        }
 
+        return analyzeAnswerGeneric(response, "updates");
     }
 
+    public <T> T processSqlSynchronized(String nativeSql, final Type clazz) throws Exception {
+        NativeSqlRequestDTO nativeSqlDTO = new NativeSqlRequestDTO()
+                .setNativeSql(nativeSql);
+
+        SystemRESTConsumerService service = restBuilder.getService(SystemRESTConsumerService.class);
+        var response = service
+                .processSql(nativeSqlDTO)
+                .execute();
+
+        var data = analyzeAnswer(response, "processSql");
+
+        Gson gson = UtilityGson.createObject();
+        String json = gson.toJson(data);
+
+        InputStream ims = new ByteArrayInputStream(json.getBytes());
+        Reader reader = new InputStreamReader(ims);
+        T gsonObj = gson.fromJson(reader, clazz);
+
+        return gsonObj;
+    }
+
+
     public <T> void processSql(String nativeSql, final Type clazz, final RunnableArgs<T> onComplete, final RunnableArgs<Exception> onFailed) {
-        NativeSqlRequestDTO nativeSqlDTO = new NativeSqlRequestDTO();
-        nativeSqlDTO.nativeSql = nativeSql;
-
-        SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class);
-        service
-                .processSql(nativeSqlDTO)
-                .enqueue(new Callback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
-                        analyzeAnswer(response, "ProcessSql", o -> {
-                            Gson gson = UtilityGson.createObject();
-
-
-                            String json = gson.toJson(o);
-
-                            InputStream ims = new ByteArrayInputStream(json.getBytes());
-                            Reader reader = new InputStreamReader(ims);
-                            T gsonObj = gson.fromJson(reader, clazz);
-
-                            onComplete.run(gsonObj);
-                        }, onFailed);
-                    }
-
-                    @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));
-                    }
-                });
+        executorService.execute(() -> {
+            try {
+                T result = processSqlSynchronized(nativeSql, clazz);
+                if (onComplete != null) onComplete.run(result);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
     }
 
 
     public void getAvailableCodMdeps(final RunnableArgs<List<AvailableCodMdepsDTO>> onSuccess, RunnableArgs<Exception> onFailed) {
-        SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class);
-        service.getAvailableCodMdeps().enqueue(new Callback<>() {
+        SystemRESTConsumerService service = restBuilder.getService(SystemRESTConsumerService.class);
+        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);
             }
         });
     }
@@ -158,20 +135,19 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
     }
 
 
+    public void sendMailSynchronized(MailRequestDTO mailDTO) throws Exception {
+        SystemRESTConsumerService service = restBuilder.getService(SystemRESTConsumerService.class);
+        var response = service.sendMail(mailDTO).execute();
+        analyzeAnswer(response, "sendMail");
+    }
+
     public void sendMail(MailRequestDTO mailDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-
-        SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class);
-        service.sendMail(mailDTO).enqueue(new Callback<>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<String>> call, Response<ServiceRESTResponse<String>> response) {
+        executorService.execute(() -> {
+            try {
+                sendMailSynchronized(mailDTO);
                 if (onComplete != null) onComplete.run();
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<String>> call, Throwable t) {
-                if (onFailed != null) {
-                    onFailed.run(new Exception(t));
-                }
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
             }
         });
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java
index 7c6f0662..bafaed7a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java
@@ -7,7 +7,6 @@ import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
-import it.integry.integrywmsnative.core.rest.model.system.RegisterDeviceRequestDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
@@ -17,10 +16,7 @@ import retrofit2.http.Query;
 public interface SystemRESTConsumerService {
 
     @GET("wms/currentVersion")
-    Call<LatestAppVersionInfoDTO> retrieveUpdatesInfo();
-
-    @POST("device/register")
-    Call<ServiceRESTResponse<Void>> registerDevice(@Body RegisterDeviceRequestDTO registerDeviceRequestDTO);
+    Call<LatestAppVersionInfoDTO> retrieveUpdatesInfo(@Query("suffix") String suffix);
 
     @POST("processSql")
     Call<ServiceRESTResponse<Object>> processSql(@Body NativeSqlRequestDTO nativeSqlDTO);
@@ -32,6 +28,6 @@ public interface SystemRESTConsumerService {
     Call<ServiceRESTResponse<List<AvailableCodMdepsDTO>>> getAvailableCodMdeps();
 
     @POST("sendEmail")
-    Call<ServiceRESTResponse<String>> sendMail(@Body MailRequestDTO mailDto);
+    Call<ServiceRESTResponse<Void>> sendMail(@Body MailRequestDTO mailDto);
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/VettoriRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/VettoriRESTConsumer.java
index b3fb1151..70291dc0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/VettoriRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/VettoriRESTConsumer.java
@@ -15,15 +15,17 @@ import retrofit2.Response;
 @Singleton
 public class VettoriRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
     private final ExecutorService executorService;
 
-    public VettoriRESTConsumer(ExecutorService executorService) {
+    public VettoriRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+        this.restBuilder = restBuilder;
         this.executorService = executorService;
     }
 
 
     public List<VtbVett> retrieveRecentlyUsedInOrdersSyncronized(GestioneEnum gestione) throws Exception {
-        var service = RESTBuilder.getService(VettoriRESTConsumerService.class);
+        var service = restBuilder.getService(VettoriRESTConsumerService.class);
         Response<ServiceRESTResponse<List<VtbVett>>> response = service.retrieveRecentlyUsedInOrders(gestione)
                 .execute();
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java
index 01cc92cc..dbd12880 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java
@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.exception.InvalidLicenseException;
+import it.integry.integrywmsnative.core.exception.UnauthorizedAccessException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.CommonRESTException;
 import it.integry.integrywmsnative.core.rest.model.EsitoType;
@@ -65,7 +66,10 @@ public abstract class _BaseRESTConsumer {
                 throw new Exception(response.message());
             }
         } else {
-            if (response.code() == 404) {
+            if (response.code() == 401) {
+                Log.e(logTitle, "Errore " + response.code() + ": Accesso non autorizzato. Si prega di controllare le credenziali e riprovare");
+                throw new UnauthorizedAccessException();
+            } else if (response.code() == 404) {
                 Log.e(logTitle, "Errore " + response.code() + ": risorsa non trovata (" + response.raw().request().url() + ")");
                 throw new Exception("Errore " + response.code() + ": risorsa non trovata (" + logTitle + ")");
             } else if (response.code() == 550)
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..7a451b91
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/handler/ManagedErrorCallback.java
@@ -0,0 +1,26 @@
+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 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(call.request().url().host(), call.request().url().port(), 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/Ean128Model.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java
index daadfc14..13a0f4e8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java
@@ -337,7 +337,7 @@ public class Ean128Model {
     public String Internal3; //Cod-Jfas
 
     ///<summary>Informazioni interne</summary>
-    public String Internal4;
+    public String Internal4; //Cod-Mdep
 
     ///<summary>Informazioni interne</summary>
     public String Internal5;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java
index 5684b5a9..3af6b4af 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java
@@ -2,6 +2,15 @@ package it.integry.integrywmsnative.core.rest.model;
 
 public class NativeSqlRequestDTO {
 
-    public String nativeSql;
+    private String nativeSql;
 
+
+    public String getNativeSql() {
+        return nativeSql;
+    }
+
+    public NativeSqlRequestDTO setNativeSql(String nativeSql) {
+        this.nativeSql = nativeSql;
+        return this;
+    }
 }
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/pv/GiacenzaPvDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/GiacenzaPvDTO.java
new file mode 100644
index 00000000..5baee5ba
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/GiacenzaPvDTO.java
@@ -0,0 +1,69 @@
+package it.integry.integrywmsnative.core.rest.model.pv;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GiacenzaPvDTO {
+
+    private String codMart;
+    private String descrizione;
+    private BigDecimal qtaInv;
+    private Date dtaInventario;
+    private String codMdep;
+    private BigDecimal incomingStock;
+
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public GiacenzaPvDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public GiacenzaPvDTO setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public BigDecimal getQtaInv() {
+        return qtaInv;
+    }
+
+    public GiacenzaPvDTO setQtaInv(BigDecimal qtaInv) {
+        this.qtaInv = qtaInv;
+        return this;
+    }
+
+    public Date getDtaInventario() {
+        return dtaInventario;
+    }
+
+    public GiacenzaPvDTO setDtaInventario(Date dtaInventario) {
+        this.dtaInventario = dtaInventario;
+        return this;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public GiacenzaPvDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public BigDecimal getIncomingStock() {
+        return incomingStock;
+    }
+
+    public GiacenzaPvDTO setIncomingStock(BigDecimal incomingStock) {
+        this.incomingStock = incomingStock;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewVerificaRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewVerificaRequestDTO.java
new file mode 100644
index 00000000..54e13263
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewVerificaRequestDTO.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.core.rest.model.pv;
+
+public class SaveNewVerificaRequestDTO {
+
+    private VerificaGiacenzeDTO data;
+
+    public VerificaGiacenzeDTO getData() {
+        return data;
+    }
+
+    public SaveNewVerificaRequestDTO setData(VerificaGiacenzeDTO data) {
+        this.data = data;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/VerificaGiacenzeDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/VerificaGiacenzeDTO.java
new file mode 100644
index 00000000..3380bc34
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/VerificaGiacenzeDTO.java
@@ -0,0 +1,41 @@
+package it.integry.integrywmsnative.core.rest.model.pv;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.BaseRestDTO;
+
+public class VerificaGiacenzeDTO extends BaseRestDTO {
+
+    private String codMdep;
+    private LocalDateTime dataVerifica;
+
+    private List<VerificaGiacenzeRowDTO> rows;
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public VerificaGiacenzeDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public LocalDateTime getDataVerifica() {
+        return dataVerifica;
+    }
+
+    public VerificaGiacenzeDTO setDataVerifica(LocalDateTime dataVerifica) {
+        this.dataVerifica = dataVerifica;
+        return this;
+    }
+
+    public List<VerificaGiacenzeRowDTO> getRows() {
+        return rows;
+    }
+
+    public VerificaGiacenzeDTO setRows(List<VerificaGiacenzeRowDTO> rows) {
+        this.rows = rows;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/VerificaGiacenzeRowDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/VerificaGiacenzeRowDTO.java
new file mode 100644
index 00000000..be97510a
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/VerificaGiacenzeRowDTO.java
@@ -0,0 +1,78 @@
+package it.integry.integrywmsnative.core.rest.model.pv;
+
+import java.math.BigDecimal;
+
+import it.integry.integrywmsnative.core.model.BaseRestDTO;
+
+public class VerificaGiacenzeRowDTO extends BaseRestDTO {
+
+    private String codMart;
+    private String partitaMag;
+    private BigDecimal qtaInGiacenza;
+    private BigDecimal qta;
+    private BigDecimal qtaCnf;
+    private BigDecimal numCnf;
+    private String barcode;
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public VerificaGiacenzeRowDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public VerificaGiacenzeRowDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public BigDecimal getQtaInGiacenza() {
+        return qtaInGiacenza;
+    }
+
+    public void setQtaInGiacenza(BigDecimal qtaInGiacenza) {
+        this.qtaInGiacenza = qtaInGiacenza;
+    }
+
+    public BigDecimal getQta() {
+        return qta;
+    }
+
+    public VerificaGiacenzeRowDTO setQta(BigDecimal qta) {
+        this.qta = qta;
+        return this;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public VerificaGiacenzeRowDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public BigDecimal getNumCnf() {
+        return numCnf;
+    }
+
+    public VerificaGiacenzeRowDTO setNumCnf(BigDecimal numCnf) {
+        this.numCnf = numCnf;
+        return this;
+    }
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public VerificaGiacenzeRowDTO setBarcode(String barcode) {
+        this.barcode = barcode;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/system/RegisterDeviceRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/system/RegisterDeviceRequestDTO.java
deleted file mode 100644
index c7b75a62..00000000
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/system/RegisterDeviceRequestDTO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package it.integry.integrywmsnative.core.rest.model.system;
-
-public class RegisterDeviceRequestDTO {
-
-    private String app;
-
-    public String getApp() {
-        return app;
-    }
-
-    public RegisterDeviceRequestDTO setApp(String app) {
-        this.app = app;
-        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/SettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java
index 027d4eb1..dc66ed20 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.settings;
 
+import java.time.LocalDateTime;
+
 import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 
 public class SettingsModel {
@@ -62,28 +64,9 @@ public class SettingsModel {
     }
 
     public static class User {
-        private String username;
-        private String password;
+
         private String fullname;
 
-        public String getUsername() {
-            return username;
-        }
-
-        public User setUsername(String username) {
-            this.username = username;
-            return this;
-        }
-
-        public String getPassword() {
-            return password;
-        }
-
-        public User setPassword(String password) {
-            this.password = password;
-            return this;
-        }
-
         public String getFullname() {
             return fullname;
         }
@@ -95,18 +78,51 @@ public class SettingsModel {
     }
 
     public static class UserSession {
+
+        private String accessToken;
+        private LocalDateTime accessTokenExpiryDate;
+        private String refreshToken;
+        private LocalDateTime refreshTokenExpiryDate;
         private String deviceId;
         private String profileDB;
         private AvailableCodMdepsDTO depo;
         private Integer defaultOrdinamentoPickingAccettazione = 0;
         private Integer defaultOrdinamentoPickingAccettazioneBolle = 0;
 
+        public String getAccessToken() {
+            return accessToken;
+        }
+
+        public UserSession setAccessToken(String accessToken) {
+            this.accessToken = accessToken;
+            return this;
+        }
+
+        public String getRefreshToken() {
+            return refreshToken;
+        }
+
+        public UserSession setRefreshToken(String refreshToken) {
+            this.refreshToken = refreshToken;
+            return this;
+        }
+
+        public LocalDateTime getRefreshTokenExpiryDate() {
+            return refreshTokenExpiryDate;
+        }
+
+        public UserSession setRefreshTokenExpiryDate(LocalDateTime refreshTokenExpiryDate) {
+            this.refreshTokenExpiryDate = refreshTokenExpiryDate;
+            return this;
+        }
+
         public String getDeviceId() {
             return deviceId;
         }
 
-        public void setDeviceId(String deviceId) {
+        public UserSession setDeviceId(String deviceId) {
             this.deviceId = deviceId;
+            return this;
         }
 
         public String getProfileDB() {
@@ -144,6 +160,15 @@ public class SettingsModel {
             this.defaultOrdinamentoPickingAccettazioneBolle = defaultOrdinamentoPickingAccettazioneBolle;
             return this;
         }
+
+        public LocalDateTime getAccessTokenExpiryDate() {
+            return accessTokenExpiryDate;
+        }
+
+        public UserSession setAccessTokenExpiryDate(LocalDateTime accessTokenExpiryDate) {
+            this.accessTokenExpiryDate = accessTokenExpiryDate;
+            return this;
+        }
     }
 
     public Server getServer() {
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..28e0a5a0 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
@@ -1,84 +1,117 @@
 package it.integry.integrywmsnative.core.update;
 
+import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
+import android.os.Handler;
 
-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 androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceManager;
 
 import java.io.File;
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
+import it.integry.integrywmsnative.BuildConfig;
+import it.integry.integrywmsnative.core.helper.ContextHelper;
 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.gest.settings.MainSettingsFragment;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
+import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAvailableView;
 
 @Singleton
 public class UpdatesManager {
 
+    private final ExecutorService executorService;
+    private final Handler handler;
+    private final SystemRESTConsumer systemRESTConsumer;
 
-    private AppCompatActivity mContext;
-
-    public void init(AppCompatActivity activityContext, SystemRESTConsumer systemRESTConsumer) {
-        this.mContext = activityContext;
-
-        final String baseEndpoint = SettingsManager.i().getServer().getProtocol() + "://" + SettingsManager.i().getServer().getHost() +
-                (SettingsManager.i().getServer().getPort() > 0 ? ":" + SettingsManager.i().getServer().getPort() : "");
-
-        final String currentVersionUrl = baseEndpoint + "/ems-api/wms/currentVersion";
-        final String currentDownloadUrl = baseEndpoint + "/ems-api/wms/android-release.apk";
-
-
-        systemRESTConsumer.retrieveUpdatesInfo(latestData -> {
-
-            AppUpdater appUpdater = new AppUpdater(mContext)
-                    .setDisplay(Display.DIALOG)
-                    .setUpdateFrom(UpdateFrom.JSON)
-                    .setUpdateJSON(currentVersionUrl)
-                    .setButtonDoNotShowAgain(null)
-                    .setButtonUpdateClickListener((dialog, which) -> {
-                        installAPK(currentDownloadUrl);
-                    });
-
-            if(latestData.isForced())
-                appUpdater.setButtonDismiss(null);
-
-            appUpdater.start();
-        }, ex -> UtilityExceptions.defaultException(mContext, ex));
+    public UpdatesManager(ExecutorService executorService, Handler handler, SystemRESTConsumer systemRESTConsumer) {
+        this.executorService = executorService;
+        this.handler = handler;
+        this.systemRESTConsumer = systemRESTConsumer;
     }
 
+    public void executeCheck(Context context, boolean forceReinstall) {
 
-    private void installAPK(String downloadURL) {
+        executorService.execute(() -> {
 
-        File destination = mContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
+            try {
+                final String baseEndpoint = SettingsManager.i().getServer().getProtocol() + "://" + SettingsManager.i().getServer().getHost() +
+                        (SettingsManager.i().getServer().getPort() > 0 ? ":" + SettingsManager.i().getServer().getPort() : "") + "/ems-api/";
+
+                SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+                var betaEnabled = sharedPreferences.getBoolean(MainSettingsFragment.KEY_BUTTON_ENABLE_BETA, false);
+
+                LatestAppVersionInfoDTO latestData = systemRESTConsumer.retrieveUpdatesInfoSynchronized(betaEnabled);
+
+                if (latestData == null)
+                    return;
+
+                if (latestData.getLatestVersionCode() < BuildConfig.VERSION_CODE)
+                    return;
+
+                boolean currentVersionIsBeta = BuildConfig.VERSION_NAME.contains("beta");
+
+                if(!forceReinstall && currentVersionIsBeta == betaEnabled && latestData.getLatestVersionCode() == BuildConfig.VERSION_CODE)
+                    return;
+
+                //Se sto passando da una beta a una stable e viceversa non obbligo l'utente a fare l'aggiornamento
+                if(currentVersionIsBeta != betaEnabled || forceReinstall) {
+                    latestData.setForced(false);
+                }
+
+                String currentDownloadUrl = baseEndpoint + latestData.getUrl();
+
+                showDialog(context, latestData, () -> {
+                    installAPK(context, currentDownloadUrl);
+                });
+
+            } catch (Exception e) {
+                handler.post(() -> {
+                    UtilityExceptions.defaultException(context, e);
+                });
+            }
+        });
+    }
+
+    private void showDialog(Context context, LatestAppVersionInfoDTO updatesData, Runnable onUpdateStart) {
+        DialogUpdateAvailableView.newInstance(updatesData, onUpdateStart)
+                .show(((FragmentActivity)context).getSupportFragmentManager(), "dialog-updates");
+    }
+
+    private void installAPK(Context context, String downloadURL) {
+
+        File destination = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
 
         var progressDialogBuilder = new DialogProgressView("Download", null, false);
-        progressDialogBuilder.show(mContext.getSupportFragmentManager(), "tag");
+        progressDialogBuilder.show(Objects.requireNonNull(ContextHelper.getFragmentManagerFromContext(context)), "tag");
 
 
         var fileDownloader = new FileDownloader()
                 .setDestFolder(destination)
                 .setUrlString(downloadURL)
                 .setOnProgressUpdate(progress -> {
-                    mContext.runOnUiThread(() -> {
+                    handler.post(() -> {
                         progressDialogBuilder.setProgress(progress);
                     });
                 })
                 .setOnDownloadCompleted(destPath -> {
 
-                    mContext.runOnUiThread(() -> {
+                    handler.post(() -> {
                         progressDialogBuilder.dismiss();
 
                         if (!destination.exists()) {
-                            UtilityExceptions.defaultException(mContext, new Exception("Errore durante il download dell'aggiornamento"));
+                            UtilityExceptions.defaultException(context, new Exception("Errore durante il download dell'aggiornamento"));
                             return;
                         }
 
@@ -87,8 +120,8 @@ public class UpdatesManager {
 
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                             intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
-                            fileLoc = GenericFileProvider.getUriForFile(mContext,
-                                    mContext.getApplicationContext().getPackageName() + ".core.update.GenericFileProvider",
+                            fileLoc = GenericFileProvider.getUriForFile(context,
+                                    context.getApplicationContext().getPackageName() + ".core.update.GenericFileProvider",
                                     destPath);
                         } else {
                             intent = new Intent(Intent.ACTION_VIEW);
@@ -98,19 +131,19 @@ public class UpdatesManager {
                         intent.setDataAndType(fileLoc, "application/vnd.android.package-archive");
                         intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
-                        mContext.startActivity(intent);
+                        context.startActivity(intent);
                     });
 
                 });
 
 
-        new Thread(() -> {
+        executorService.execute(() -> {
             try {
                 fileDownloader.download();
             } catch (Exception e) {
                 progressDialogBuilder.dismissAllowingStateLoss();
-                UtilityExceptions.defaultException(mContext, e);
+                UtilityExceptions.defaultException(context, e);
             }
-        }).start();
+        });
     }
 }
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/UtilityBarcode.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java
index febdf753..2884f6ba 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java
@@ -1,14 +1,17 @@
 package it.integry.integrywmsnative.core.utility;
 
 import android.graphics.Bitmap;
-import android.graphics.Color;
 
 import com.annimon.stream.Stream;
 import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.common.BitMatrix;
+import com.journeyapps.barcodescanner.BarcodeEncoder;
 
 import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.barcode_base_android_library.model.BarcodeType;
@@ -17,6 +20,7 @@ import it.integry.integrywmsnative.core.settings.SettingsManager;
 
 public class UtilityBarcode {
 
+    public static final char FNC1 = 0x00f1;
 
     public static boolean isBarcodeOrdineV(BarcodeScanDTO barcodeScanDTO) {
         return (isEan13(barcodeScanDTO) || isEtichetta128(barcodeScanDTO)) && barcodeScanDTO.getStringValue().startsWith("3");
@@ -161,15 +165,15 @@ public class UtilityBarcode {
     }
 
     public static Bitmap generateBarcodeImage(String barcode, int width, int height) throws Exception {
-        if(barcode == null) return null;
+        if (barcode == null) return null;
 
         BarcodeType barcodeType;
 
-        if(barcode.length() == 8)
+        if (barcode.length() == 8)
             barcodeType = BarcodeType.EAN8;
-        else if(barcode.length() == 13)
+        else if (barcode.length() == 13)
             barcodeType = BarcodeType.EAN13;
-        else if(barcode.length() == 14)
+        else if (barcode.length() == 14)
             barcodeType = BarcodeType.INTERLEAVED_2OF5;
         else throw new Exception("Barcode " + barcode + " non valido");
 
@@ -177,25 +181,49 @@ public class UtilityBarcode {
     }
 
     public static Bitmap generateBarcodeImage(String barcode, BarcodeType type, int width, int height) throws Exception {
-        // Genera la matrice del codice a barre
-        MultiFormatWriter writer = new MultiFormatWriter();
 
-        BarcodeFormat barcodeFormat = switch (type) {
-            case EAN8 -> BarcodeFormat.EAN_8;
-            case EAN13 -> BarcodeFormat.EAN_13;
-            case INTERLEAVED_2OF5 -> BarcodeFormat.ITF;
-            case CODE128 -> BarcodeFormat.CODE_128;
-            default -> throw new Exception("Barcode " + barcode + " non valido (tipo: " + type + ")");
-        };
+        if (barcode == null) return null;
 
-        BitMatrix bitMatrix = writer.encode(barcode, barcodeFormat, width, height);
+        Bitmap bitmap = null;
 
-        // Crea un bitmap a partire dalla matrice
-        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        for (int x = 0; x < width; x++) {
-            for (int y = 0; y < height; y++) {
-                bitmap.setPixel(x, y, bitMatrix.get(x, y) ? Color.BLACK : Color.WHITE);
+        if (type == BarcodeType.EAN128) {
+            if(barcode.charAt(0) != FNC1) {
+                barcode = FNC1 + barcode;
             }
+
+            Map<EncodeHintType, Object> hints = new HashMap<>();
+            hints.put(EncodeHintType.CHARACTER_SET, "ISO-8859-1");
+            hints.put(EncodeHintType.MARGIN, 10); // Quiet zone
+
+            // Crea il codice a barre
+            MultiFormatWriter multiFormatWriter = new MultiFormatWriter();
+            BitMatrix bitMatrix = multiFormatWriter.encode(
+                    barcode,
+                    BarcodeFormat.CODE_128,
+                    width,  // Larghezza
+                    height,  // Altezza
+                    hints
+            );
+
+            // Converti in bitmap
+            BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
+            bitmap = barcodeEncoder.createBitmap(bitMatrix);
+        } else {
+            BarcodeFormat barcodeFormat = switch (type) {
+                case EAN8 -> BarcodeFormat.EAN_8;
+                case EAN13 -> BarcodeFormat.EAN_13;
+                case INTERLEAVED_2OF5 -> BarcodeFormat.ITF;
+                case CODE128 -> BarcodeFormat.CODE_128;
+                default ->
+                        throw new Exception("Barcode " + barcode + " non valido (tipo: " + type + ")");
+            };
+
+            MultiFormatWriter writer = new MultiFormatWriter();
+            BitMatrix bitMatrix = writer.encode(barcode, barcodeFormat, width, height);
+
+
+            BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
+            bitmap = barcodeEncoder.createBitmap(bitMatrix);
         }
 
         return bitmap;
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/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
index cfe305fa..7c9a097c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
@@ -3,7 +3,6 @@ package it.integry.integrywmsnative.core.utility;
 import android.content.Context;
 import android.text.Html;
 
-import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
 import com.annimon.stream.Stream;
@@ -14,6 +13,7 @@ import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.exception.InvalidConnectionException;
 import it.integry.integrywmsnative.core.exception.InvalidLUException;
 import it.integry.integrywmsnative.core.exception.InvalidLUGestioneException;
+import it.integry.integrywmsnative.core.helper.ContextHelper;
 import it.integry.integrywmsnative.core.rest.CommonRESTException;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
@@ -44,13 +44,7 @@ public class UtilityExceptions {
             if (ex.getCause() != null) errorMessage += "<br />" + ex.getCause().getMessage();
         }
 
-        FragmentManager fm = null;
-
-        if (context instanceof FragmentActivity) {
-            fm = ((FragmentActivity) context).getSupportFragmentManager();
-        } else if (UtilityContext.getMainActivity() != null) {
-            fm = UtilityContext.getMainActivity().getSupportFragmentManager();
-        }
+        FragmentManager fm = ContextHelper.getFragmentManagerFromContext(context);
 
         if (fm != null) {
             DialogSimpleMessageView.makeErrorDialog(Html.fromHtml(errorMessage), null, null)
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/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..2943c7c1 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
@@ -111,9 +111,14 @@ public class UtilityString {
     public static boolean isNullOrEmpty(String stringToCheck){
         return stringToCheck == null || stringToCheck.trim().isEmpty();
     }
-
-    public static String isNull(String stringToCheck, String alternativeString){
-        return isNullOrEmpty(stringToCheck) ? alternativeString : stringToCheck;
+    
+    public static String isNull(String... strings) {
+        for (String string : strings) {
+            if (!isNullOrEmpty(string)) {
+                return string;
+            }
+        }
+        return null;
     }
 
     public static String empty2null(String stringToCheck) {
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/MainAccettazioneBollaElencoModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/MainAccettazioneBollaElencoModule.java
index 0491cd7a..7a600f27 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/MainAccettazioneBollaElencoModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/MainAccettazioneBollaElencoModule.java
@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.accettazione_bolla_elenco;
 
 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.BolleAccettazioneRESTConsumer;
 
 @Module(subcomponents = {MainAccettazioneBollaElencoComponent.class})
@@ -9,8 +10,8 @@ public class MainAccettazioneBollaElencoModule {
 
 
     @Provides
-    BolleAccettazioneRESTConsumer providesBolleAccettazioneRESTConsumer() {
-        return new BolleAccettazioneRESTConsumer();
+    BolleAccettazioneRESTConsumer providesBolleAccettazioneRESTConsumer(RESTBuilder restBuilder) {
+        return new BolleAccettazioneRESTConsumer(restBuilder);
     }
 
 
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..c8d0d23d 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,45 +17,49 @@ 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
 public class BolleAccettazioneRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
+    public BolleAccettazioneRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
 
     public void retrieveBolleDaAccettare(RunnableArgs<List<TestataBollaAccettazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        BolleAccettazioneRESTConsumerService service = RESTBuilder.getService(BolleAccettazioneRESTConsumerService.class);
+        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);
                     }
                 });
     }
 
     public void retrievePickingListBolle(List<TestataBollaAccettazioneDTO> bolle, RunnableArgs<List<SitBollaAccettazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        BolleAccettazioneRESTConsumerService service = RESTBuilder.getService(BolleAccettazioneRESTConsumerService.class);
+        BolleAccettazioneRESTConsumerService service = restBuilder.getService(BolleAccettazioneRESTConsumerService.class);
 
         var request = new RetrieveElencoArticoliAccettazioneBollaRequestDTO()
                 .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..3f899f04 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
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.SpannableString;
 import android.view.Gravity;
 
@@ -16,7 +17,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 +378,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 +387,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 +488,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 +510,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();
         });
     }
 
@@ -685,4 +691,15 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
             }
         }
     }
+
+    @Override
+    public void onConfirmAnomalie(int anomalie, RunnableArgs<Boolean> onConfirm) {
+        DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(String.format(getString(R.string.confirm_anomalie), anomalie))),
+                        null, () -> {
+                            onConfirm.run(true);
+                        }, () -> {
+                            onConfirm.run(false);
+                        })
+                .show(getSupportFragmentManager(), "tag");
+    }
 }
\ No newline at end of file
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..2e388663 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
@@ -92,13 +92,7 @@ public class AccettazioneBollaPickingViewModel {
     private final List<HistoryMtbAartDTO> mHistoryUsedAarts = new ArrayList<>();
 
     @Inject
-    public AccettazioneBollaPickingViewModel(ArticoloRESTConsumer articoloRESTConsumer,
-                                             BarcodeRESTConsumer barcodeRESTConsumer,
-                                             ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
-                                             PrinterRESTConsumer printerRESTConsumer,
-                                             AccettazioneBollaPickingRESTConsumer accettazioneBollaPickingRESTConsumer,
-                                             ColliAccettazioneRESTConsumer colliAccettazioneRESTConsumer,
-                                             ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer) {
+    public AccettazioneBollaPickingViewModel(ArticoloRESTConsumer articoloRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer, AccettazioneBollaPickingRESTConsumer accettazioneBollaPickingRESTConsumer, ColliAccettazioneRESTConsumer colliAccettazioneRESTConsumer, ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer) {
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
@@ -112,10 +106,9 @@ public class AccettazioneBollaPickingViewModel {
         this.mBolle = bolle;
         this.mUseQtaBolla = useQtaOrd;
 
-        List<SitBollaAccettazioneDTO> mSitArts = Stream.of(sitArts)
-                .filter(x ->
-                        UtilityBigDecimal.greaterThan(x.getQtaDaAccettare(), BigDecimal.ZERO))
-                .toList();
+        List<SitBollaAccettazioneDTO> mSitArts = sitArts.stream()
+                .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaDaAccettare(), BigDecimal.ZERO))
+                .collect(Collectors.toList());
 
         getEmptyPickingList(mSitArts, this.mPickingList::postValue);
 
@@ -650,7 +643,6 @@ public class AccettazioneBollaPickingViewModel {
                 .setQtaCnf(qtaCnf)
                 .setNumCnf(numCnf)
                 .setPartitaMag(partitaMag)
-//                .setCodJcom(pickingObjectDTO.getSitBollaAccettazione().getCodJcom())
                 .setDataDoc(sitBolla != null ? sitBolla.getDataDoc() : firstAvailableBolla.getDataDoc())
                 .setNumDoc(sitBolla != null ? sitBolla.getNumDoc() : firstAvailableBolla.getNumDoc())
                 .setCodDtip(sitBolla != null ? sitBolla.getCodDtip() : firstAvailableBolla.getCodDtip())
@@ -668,7 +660,7 @@ public class AccettazioneBollaPickingViewModel {
                     .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
                     .setMtbAart(pickingObjectDTO.getMtbAart());
 
-            pickingObjectDTO.getWithdrawMtbColrs().add(0, insertedMtbColr);
+            pickingObjectDTO.getWithdrawMtbColrs().add(insertedMtbColr);
             mCurrentMtbColt.getMtbColr().add(0, insertedMtbColr);
 
             //Chiamato removeListFilter perché cosi mi cancella tutti i dati di pick temporanei
@@ -808,21 +800,42 @@ public class AccettazioneBollaPickingViewModel {
             } else {
                 CloseUDCRequestDTO closeUDCRequestDTO = new CloseUDCRequestDTO()
                         .setMtbColt(mCurrentMtbColt);
-                mColliCaricoRESTConsumer.closeUDC(closeUDCRequestDTO, closeUDCResponse -> {
 
-                    Runnable onVersamentoCompleted = () -> {
-                        managePrintCollo(this::postCloseOperations);
+                ObservableArrayList<MtbColr> mtbColr = mCurrentMtbColt.getMtbColr();
+                List<PickingObjectDTO> pickingList = getPickingList().getValue();
 
-                        this.sendLUClosed();
-                        this.sendOnLoadingEnded();
-                    };
+                int listCount = pickingList != null ? pickingList.size() : 0;
+                int anomalie = listCount > 0 ? listCount - mtbColr.size() : 0;
 
-                    manageVersamentoAutomatico(onVersamentoCompleted);
-                }, this::sendError);
+                if (anomalie == 0){
+                    closeUdc(closeUDCRequestDTO);
+                } else {
+                    onConfirmAnomalie(anomalie, canBeClose -> {
+                        if (canBeClose) {
+                            closeUdc(closeUDCRequestDTO);
+                        } else {
+                            this.sendOnLoadingEnded();
+                        }
+                    });
+                }
             }
         }, this::sendError);
     }
 
+    private void closeUdc(CloseUDCRequestDTO closeUDCRequestDTO){
+        mColliCaricoRESTConsumer.closeUDC(closeUDCRequestDTO, closeUDCResponse -> {
+
+            Runnable onVersamentoCompleted = () -> {
+                managePrintCollo(this::postCloseOperations);
+
+                this.sendLUClosed();
+                this.sendOnLoadingEnded();
+            };
+
+            manageVersamentoAutomatico(onVersamentoCompleted);
+        }, this::sendError);
+    }
+
     private void manageVersamentoAutomatico(Runnable onComplete) {
 
         if (!SettingsManager.iDB().isFlagAccettazioneBollaAskVersamentoAutomatico()) {
@@ -1045,6 +1058,9 @@ public class AccettazioneBollaPickingViewModel {
         return this;
     }
 
+    private void onConfirmAnomalie(int anomalie, RunnableArgs<Boolean> onConfirm){
+        if (this.mListener != null) mListener.onConfirmAnomalie(anomalie, onConfirm);
+    }
 
     public interface Listener extends ILoadingListener, ILUPrintListener, ILUBaseOperationsListener {
 
@@ -1082,6 +1098,8 @@ public class AccettazioneBollaPickingViewModel {
 
         void onUnknownBarcodeScanned(String barcode, RunnableArgs<String> done, Runnable abort);
 
+        void onConfirmAnomalie(int anomalie, RunnableArgs<Boolean> onConfirm);
+
     }
 
 }
\ No newline at end of file
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..34562424 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,33 +9,37 @@ 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
 public class AccettazioneBollaPickingRESTConsumer extends _BaseRESTConsumer {
 
+
+    private final RESTBuilder restBuilder;
+
     @Inject
-    public AccettazioneBollaPickingRESTConsumer() {
+    public AccettazioneBollaPickingRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
     }
 
 
     public void retrieveAlreadyRegisteredUDC(List<TestataBollaAccettazioneDTO> bolle, RunnableArgs<List<AlreadyRegisteredUDCDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        AccettazioneBollaPickingRESTConsumerService service = RESTBuilder.getService(AccettazioneBollaPickingRESTConsumerService.class);
+        AccettazioneBollaPickingRESTConsumerService service = restBuilder.getService(AccettazioneBollaPickingRESTConsumerService.class);
 
         var request = new RetrieveAlreadyRegisteredULAccettazioneBollaRequestDTO()
                 .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 +48,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..bf8f8a83 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
@@ -2,12 +2,10 @@ package it.integry.integrywmsnative.gest.accettazione_bolla_picking.ui;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.ObservableArrayList;
@@ -17,11 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
@@ -68,29 +62,10 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
         this.mShowSecondaryUntMis = showSecondaryUntMis;
 
         mutableDataSet.addOnListChangedCallback(new OnListGeneralChangedCallback() {
-            @RequiresApi(api = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
             @Override
             public void onChanged(ObservableList sender) {
-                List<AccettazioneBollaPickingListModel> listaOrdinata = new ArrayList<>();
-                if (!sender.isEmpty()) {
-                    listaOrdinata = new ArrayList<>(sender);
-
-                    Collections.sort(listaOrdinata, (a, b) -> {
-
-                        boolean condA = a.getQtaEvasa().floatValue() > 0;
-                        boolean condB = b.getQtaEvasa().floatValue() > 0;
-
-                        if (condA && !condB) {
-                            return -1;
-                        } else if (!condA && condB) {
-                            return 1;
-                        }
-                        return 0;
-                    });
-                }
-
                 mDataset.clear();
-                mDataset.addAll(listaOrdinata);
+                mDataset.addAll(sender);
                 notifyDataSetChanged();
                 notifyDataChanged();
             }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/MainAccettazioneOrdiniElencoModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/MainAccettazioneOrdiniElencoModule.java
index 2adf196b..1bc636e7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/MainAccettazioneOrdiniElencoModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/MainAccettazioneOrdiniElencoModule.java
@@ -2,14 +2,15 @@ package it.integry.integrywmsnative.gest.accettazione_ordini_elenco;
 
 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.rest.OrdiniAccettazioneRESTConsumer;
 
 @Module(subcomponents = {MainAccettazioneOrdiniElencoComponent.class})
 public class MainAccettazioneOrdiniElencoModule {
 
     @Provides
-    OrdiniAccettazioneRESTConsumer providesOrdiniAccettazioneRESTConsumer() {
-        return new OrdiniAccettazioneRESTConsumer();
+    OrdiniAccettazioneRESTConsumer providesOrdiniAccettazioneRESTConsumer(RESTBuilder restBuilder) {
+        return new OrdiniAccettazioneRESTConsumer(restBuilder);
     }
 
     @Provides
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..1845d925 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,30 +11,34 @@ 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
 public class OrdiniAccettazioneRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
+    public OrdiniAccettazioneRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
 
     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<>() {
+        OrdiniAccettazioneRESTConsumerService service = restBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
+        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);
             }
         });
     }
@@ -46,17 +52,16 @@ public class OrdiniAccettazioneRESTConsumer extends _BaseRESTConsumer {
                         .setNumero(x.getNumero()))
                 .toList();
 
-        OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
-        service.getArticoliFromOrdiniAccettazione(getPickingListDTOs).enqueue(new Callback<ServiceRESTResponse<List<SitArtOrdDTO>>>() {
+        OrdiniAccettazioneRESTConsumerService service = restBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
+        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..e7805e0c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.Html;
 import android.text.SpannableString;
 import android.view.Gravity;
@@ -18,7 +19,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;
@@ -92,6 +93,9 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     @Inject
     DialogInputQuantityV2View mDialogInputQuantityV2View;
 
+    @Inject
+    Handler handler;
+
     private final AccettazionePickingFiltroOrdineViewModel mAppliedFilterViewModel = new AccettazionePickingFiltroOrdineViewModel();
 
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
@@ -355,7 +359,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 +418,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 +476,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 +531,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 +587,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);
             }
 
@@ -646,8 +654,16 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         this.fabPopupMenu.dismiss();
         this.onLoadingStarted();
 
-        this.mViewModel.createNewLU(null, null, null, false, () -> {
-            this.onLoadingEnded();
+        executorService.execute(() -> {
+            try {
+                //Aggiunto perchè a volte rimaneva il dialog di caricamento avanti a tutto
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            this.mViewModel.createNewLU(null, null, null, false, () -> {
+                this.onLoadingEnded();
+            });
         });
     }
 
@@ -736,7 +752,9 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete) {
-        DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded).show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
+        handler.post(() -> {
+            DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded).show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
+        });
     }
 
     @Override
@@ -776,7 +794,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 +841,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/AccettazioneOrdiniPickingModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingModule.java
index 416193b7..8306edc7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingModule.java
@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.gest.accettazione_ordini_picking;
 import dagger.Module;
 import dagger.Provides;
 import it.integry.integrywmsnative.core.ean128.Ean128Service;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliAccettazioneRESTConsumer;
@@ -17,8 +18,8 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag
 public class AccettazioneOrdiniPickingModule {
 
     @Provides
-    AccettazioneOrdiniPickingRESTConsumer providesAccettazionePickingRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new AccettazioneOrdiniPickingRESTConsumer(systemRESTConsumer);
+    AccettazioneOrdiniPickingRESTConsumer providesAccettazionePickingRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        return new AccettazioneOrdiniPickingRESTConsumer(restBuilder, systemRESTConsumer);
     }
 
     @Provides
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..d6aae114 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,32 +13,34 @@ 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
 public class AccettazioneOrdiniPickingRESTConsumer extends _BaseRESTConsumer {
 
-    private final SystemRESTConsumer mSystemRestConsumer;
+    private final RESTBuilder restBuilder;
+    private final SystemRESTConsumer systemRestConsumer;
 
     @Inject
-    public AccettazioneOrdiniPickingRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        this.mSystemRestConsumer = systemRESTConsumer;
+    public AccettazioneOrdiniPickingRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        this.restBuilder = restBuilder;
+        this.systemRestConsumer = systemRESTConsumer;
     }
 
     public void getBancaliGiaRegistrati(List<OrdineAccettazioneInevasoDTO> ordiniToShow, RunnableArgs<List<AlreadyRegisteredUDCDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        AccettazioneOrdiniPickingRESTConsumerService service = RESTBuilder.getService(AccettazioneOrdiniPickingRESTConsumerService.class);
+        AccettazioneOrdiniPickingRESTConsumerService service = restBuilder.getService(AccettazioneOrdiniPickingRESTConsumerService.class);
 
         var request = new RetrieveAlreadyRegisteredULAccettazioneOrdineRequestDTO()
                 .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 +49,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/ArticoliInGiacenzaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaFragment.java
index 6bb6d754..3832ac9d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaFragment.java
@@ -99,7 +99,7 @@ public class ArticoliInGiacenzaFragment extends BaseFragment implements ITitledF
     }
 
     private void choosePosition(RunnableArgs<MtbDepoPosizione> onComplete) {
-        DialogAskPositionOfLUView.makeBase(false, (status, mtbDepoPosizione) -> {
+        DialogAskPositionOfLUView.newInstance(false, (status, mtbDepoPosizione) -> {
 
                     if (status == DialogConsts.Results.ABORT) {
                         popMe();
@@ -107,7 +107,7 @@ public class ArticoliInGiacenzaFragment extends BaseFragment implements ITitledF
                         onComplete.run(mtbDepoPosizione);
                     }
 
-                }, this::onError)
+                })
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
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..e429524a 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,55 +6,56 @@ 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
 public class DocInterniRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
     private final MagazzinoRESTConsumer magazzinoRESTConsumer;
 
-    public DocInterniRESTConsumer(MagazzinoRESTConsumer magazzinoRESTConsumer) {
+    public DocInterniRESTConsumer(RESTBuilder restBuilder, MagazzinoRESTConsumer magazzinoRESTConsumer) {
+        this.restBuilder = restBuilder;
         this.magazzinoRESTConsumer = magazzinoRESTConsumer;
     }
 
     public void getDocInterniSetup(RunnableArgs<DocInterniSetupDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        DocInterniRESTConsumerService service = RESTBuilder.getService(DocInterniRESTConsumerService.class);
-        service.getSetupDocInterni().enqueue(new Callback<>() {
+        DocInterniRESTConsumerService service = restBuilder.getService(DocInterniRESTConsumerService.class);
+        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);
             }
         });
     }
 
     public void retrieveLotti(String codProd, RunnableArgs<List<RetrieveLottiDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        DocInterniRESTConsumerService service = RESTBuilder.getService(DocInterniRESTConsumerService.class);
+        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/inventario/ElencoInventariFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariFragment.java
index 948a3540..e734ffb4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariFragment.java
@@ -20,7 +20,7 @@ import javax.inject.Inject;
 import it.integry.integrywmsnative.BR;
 import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioEntity;
 import it.integry.integrywmsnative.core.expansion.BaseFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.interfaces.ILifecycleFragment;
@@ -94,7 +94,7 @@ public class ElencoInventariFragment extends BaseFragment implements ITitledFrag
             mBinding.emptyView.setVisibility(data == null || data.isEmpty() ? View.VISIBLE : View.GONE);
         });
 
-        var itemType = new Type<InventarioRoomDTO, FragmentElencoInventarioListSingleItemBinding>(R.layout.fragment_elenco_inventario_list_single_item, BR.item);
+        var itemType = new Type<InventarioEntity, FragmentElencoInventarioListSingleItemBinding>(R.layout.fragment_elenco_inventario_list_single_item, BR.item);
         itemType.onClick(x -> {
 
             var item = x.getBinding().getItem();
@@ -123,7 +123,7 @@ public class ElencoInventariFragment extends BaseFragment implements ITitledFrag
         });
 
         new LiveAdapter(mViewModel.getInventarioList(), this)
-                .map(InventarioRoomDTO.class, itemType)
+                .map(InventarioEntity.class, itemType)
                 .into(this.mBinding.inventarioList);
 
 
@@ -152,8 +152,8 @@ public class ElencoInventariFragment extends BaseFragment implements ITitledFrag
     }
 
     @Override
-    public void onInventarioLoaded(InventarioRoomDTO inventarioRoomDTO, List<InventarioArtDTO> listaArts) {
-        startPicking(inventarioRoomDTO, listaArts);
+    public void onInventarioLoaded(InventarioEntity inventarioEntity, List<InventarioArtDTO> listaArts) {
+        startPicking(inventarioEntity, listaArts);
     }
 
     @Override
@@ -173,8 +173,8 @@ public class ElencoInventariFragment extends BaseFragment implements ITitledFrag
     }
 
 
-    private void startPicking(InventarioRoomDTO inventarioRoomDTO, List<InventarioArtDTO> listArts) {
-        PickingInventarioActivity.startActivity(requireContext(), inventarioRoomDTO, listArts);
+    private void startPicking(InventarioEntity inventarioEntity, List<InventarioArtDTO> listArts) {
+        PickingInventarioActivity.startActivity(requireContext(), inventarioEntity, listArts);
     }
 
     @Override
@@ -196,13 +196,13 @@ public class ElencoInventariFragment extends BaseFragment implements ITitledFrag
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
-    public void deleteInventarioRequest(InventarioRoomDTO inventarioRoomDTO) {
+    public void deleteInventarioRequest(InventarioEntity inventarioEntity) {
         DialogYesNoView
                 .newInstance(null, "Vuoi cancellare l'inventario?",
                         dialogResponse -> {
                             switch (dialogResponse) {
                                 case YES:
-                                    this.mViewModel.deleteInventario(inventarioRoomDTO);
+                                    this.mViewModel.deleteInventario(inventarioEntity);
                                     break;
 
                                 case NO:
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariModule.java
index 04752e0c..74164fe2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariModule.java
@@ -5,6 +5,7 @@ import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.InventarioRepository;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.rest.consumers.InventarioRESTConsumer;
 
@@ -13,8 +14,8 @@ public class ElencoInventariModule {
 
     @Provides
     @Singleton
-    InventarioRESTConsumer providesInventarioRESTConsumer() {
-        return new InventarioRESTConsumer();
+    InventarioRESTConsumer providesInventarioRESTConsumer(RESTBuilder restBuilder) {
+        return new InventarioRESTConsumer(restBuilder);
     }
 
     @Provides
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariViewModel.java
index 26587640..4340a177 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariViewModel.java
@@ -7,7 +7,7 @@ import com.annimon.stream.Stream;
 import java.util.List;
 import java.util.Objects;
 
-import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioEntity;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.InventarioRepository;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
@@ -25,7 +25,7 @@ public class ElencoInventariViewModel {
     private final SettingsManager settingsManager;
     private Listener listener;
 
-    private LiveData<List<InventarioRoomDTO>> inventarioList;
+    private LiveData<List<InventarioEntity>> inventarioList;
 
     private final String codMdep;
 
@@ -52,7 +52,7 @@ public class ElencoInventariViewModel {
         inventarioList = null;
     }
 
-    public LiveData<List<InventarioRoomDTO>> getInventarioList() {
+    public LiveData<List<InventarioEntity>> getInventarioList() {
         return inventarioList;
     }
 
@@ -101,12 +101,12 @@ public class ElencoInventariViewModel {
     }
 
 
-    public void createNewInventario(long inventoryId, String zone, RunnableArgss<InventarioRoomDTO, List<InventarioArtDTO>> onComplete) {
+    public void createNewInventario(long inventoryId, String zone, RunnableArgss<InventarioEntity, List<InventarioArtDTO>> onComplete) {
         this.sendOnLoadingStarted();
 
         var codMdep = settingsManager.getSettings().getUserSession().getDepo().getCodMdep();
 
-        var createdInventario = new InventarioRoomDTO();
+        var createdInventario = new InventarioEntity();
         createdInventario.setIdInventario(inventoryId);
         createdInventario.setZona(zone);
         createdInventario.setCodMdep(codMdep);
@@ -121,8 +121,8 @@ public class ElencoInventariViewModel {
         });
     }
 
-    public void deleteInventario(InventarioRoomDTO inventarioRoomDTO) {
-        inventarioRepository.delete(inventarioRoomDTO, null, this::sendOnError);
+    public void deleteInventario(InventarioEntity inventarioEntity) {
+        inventarioRepository.delete(inventarioEntity, null, this::sendOnError);
     }
 
 
@@ -134,8 +134,8 @@ public class ElencoInventariViewModel {
         if (listener != null) listener.onInventarioInfoRequest(onComplete);
     }
 
-    private void sendOnInventarioLoaded(InventarioRoomDTO inventarioRoomDTO, List<InventarioArtDTO> listaArts) {
-        if (listener != null) listener.onInventarioLoaded(inventarioRoomDTO, listaArts);
+    private void sendOnInventarioLoaded(InventarioEntity inventarioEntity, List<InventarioArtDTO> listaArts) {
+        if (listener != null) listener.onInventarioLoaded(inventarioEntity, listaArts);
     }
 
     private void sendCreateInventarioRequest(long inventoryId, String zone) {
@@ -170,7 +170,7 @@ public class ElencoInventariViewModel {
 
         void onInventarioInfoRequest(RunnableArgss<Long, String> onComplete);
 
-        void onInventarioLoaded(InventarioRoomDTO inventarioRoomDTO, List<InventarioArtDTO> listaArts);
+        void onInventarioLoaded(InventarioEntity inventarioEntity, List<InventarioArtDTO> listaArts);
 
         void onInventoriesLoadingStarted();
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsView.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsView.java
index 96283ccc..9e39b533 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsView.java
@@ -14,7 +14,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.MainApplication;
-import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioEntity;
 import it.integry.integrywmsnative.databinding.BottomSheetInventarioActionsViewBinding;
 
 public class BottomSheetInventarioActionsView extends BottomSheetDialogFragment {
@@ -28,9 +28,9 @@ public class BottomSheetInventarioActionsView extends BottomSheetDialogFragment
     private BottomSheetInventarioActionsViewBinding mBinding;
     private Listener mListener;
 
-    private final InventarioRoomDTO inputItem;
+    private final InventarioEntity inputItem;
 
-    public BottomSheetInventarioActionsView(InventarioRoomDTO inputItem) {
+    public BottomSheetInventarioActionsView(InventarioEntity inputItem) {
         this.inputItem = inputItem;
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsViewModel.java
index c1d14ab1..0bc091b8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsViewModel.java
@@ -2,17 +2,17 @@ package it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_act
 
 import androidx.lifecycle.MutableLiveData;
 
-import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioEntity;
 
 public class BottomSheetInventarioActionsViewModel {
 
-    private final MutableLiveData<InventarioRoomDTO> mCurrentItem = new MutableLiveData<>();
+    private final MutableLiveData<InventarioEntity> mCurrentItem = new MutableLiveData<>();
 
-    public void init(InventarioRoomDTO item) {
+    public void init(InventarioEntity item) {
         this.mCurrentItem.postValue(item);
     }
 
-    public MutableLiveData<InventarioRoomDTO> getCurrentItem() {
+    public MutableLiveData<InventarioEntity> getCurrentItem() {
         return mCurrentItem;
     }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java
index 7f65b7a4..43a6895f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java
@@ -25,7 +25,7 @@ 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.data_cache.DataCache;
-import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioEntity;
 import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -64,10 +64,10 @@ public class PickingInventarioActivity extends BaseActivity implements PickingIn
     private int barcodeScannerIstanceID;
 
     //Pass here all external parameters
-    public static void startActivity(Context context, InventarioRoomDTO inventarioRoomDTO, List<InventarioArtDTO> inventarioArts) {
+    public static void startActivity(Context context, InventarioEntity inventarioEntity, List<InventarioArtDTO> inventarioArts) {
         Intent myIntent = new Intent(context, PickingInventarioActivity.class);
 
-        String keyExtraItem = DataCache.addItem(inventarioRoomDTO);
+        String keyExtraItem = DataCache.addItem(inventarioEntity);
         myIntent.putExtra(KEY_INVENTARIO, keyExtraItem);
 
         String keyExtraArtsItem = DataCache.addItem(inventarioArts);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
index 4cc4d50c..3378ad08 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
-import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioEntity;
 import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.InventarioRepository;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.InventarioRowRepository;
@@ -41,7 +41,7 @@ public class PickingInventarioViewModel extends ViewModel {
     private final BarcodeRESTConsumer barcodeRESTConsumer;
     private final InventarioRepository inventarioRepository;
     private final InventarioRowRepository inventarioRowRepository;
-    public MutableLiveData<InventarioRoomDTO> currentInventario = new MutableLiveData<>();
+    public MutableLiveData<InventarioEntity> currentInventario = new MutableLiveData<>();
     public LiveData<List<InventarioRowRoomDTO>> currentInventarioRows = new MutableLiveData<>();
     private boolean canAddUnknownItems;
     private boolean flagShouldAskToCreateOrUpdateRowInventario;
@@ -56,14 +56,14 @@ public class PickingInventarioViewModel extends ViewModel {
         this.barcodeRESTConsumer = barcodeRESTConsumer;
     }
 
-    public void init(InventarioRoomDTO inventarioRoomDTO, List<InventarioArtDTO> inventarioArts, boolean canAddUnknownItems, boolean flagShouldAskToCreateOrUpdateRowInventario) {
+    public void init(InventarioEntity inventarioEntity, List<InventarioArtDTO> inventarioArts, boolean canAddUnknownItems, boolean flagShouldAskToCreateOrUpdateRowInventario) {
         this.canAddUnknownItems = canAddUnknownItems;
         this.flagShouldAskToCreateOrUpdateRowInventario = flagShouldAskToCreateOrUpdateRowInventario;
 
         this.sendOnLoadingStarted();
 
-        this.currentInventario.postValue(inventarioRoomDTO);
-        this.currentInventarioRows = inventarioRowRepository.retrieve(inventarioRoomDTO.getId());
+        this.currentInventario.postValue(inventarioEntity);
+        this.currentInventarioRows = inventarioRowRepository.retrieve(inventarioEntity.getId());
         this.availableInventarioArts = inventarioArts == null ? new ArrayList<>() : inventarioArts;
 
         UtilityLiveData.observeOnce(this.currentInventarioRows, data -> {
@@ -73,7 +73,7 @@ public class PickingInventarioViewModel extends ViewModel {
         this.sendOnLoadingEnded();
     }
 
-    public LiveData<InventarioRoomDTO> getCurrentInventario() {
+    public LiveData<InventarioEntity> getCurrentInventario() {
         return currentInventario;
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java
index 18e36266..190cfa64 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java
@@ -18,6 +18,7 @@ import it.integry.integrywmsnative.SplashActivity;
 import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.di.BindableString;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityWindow;
@@ -104,18 +105,39 @@ public class LoginActivity extends BaseActivity implements LoginViewModel.Listen
     }
 
     @Override
-    public void onLoginCompleted(String protocol, String host, int port, String fullName, List<String> availableProfiles) {
+    public void onLoginCompleted(String fullName) {
 
         this.onLoadingEnded();
         runOnUiThread(() -> DialogSimpleMessageView.makeSuccessDialog(
-                "Benvenuto",
-                Html.fromHtml("Ciao <b>" + fullName + "</b>, la Integry le augura di svolgere al meglio il suo lavoro"),
-                null,
-                () -> showProfileDBSelectionDialog(protocol, host, port, availableProfiles))
+                        "Benvenuto",
+                        Html.fromHtml("Ciao <b>" + fullName + "</b>, la Integry le augura di svolgere al meglio il suo lavoro"),
+                        null,
+                        this::startSplashActivity)
                 .show(getSupportFragmentManager(), "tag"));
 
     }
 
+    @Override
+    public void requestProfileSelection(List<String> availableProfiles, RunnableArgs<String> onComplete) {
+        // setup the alert builder
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.action_choose_profile_db);
+
+        // add a list
+        String[] profiles = new String[availableProfiles.size()];
+        profiles = availableProfiles
+                .toArray(profiles);
+
+        builder.setItems(profiles, (dialog, which) -> {
+            //SettingsManager.i().getUserSession().setProfileDB(availableProfiles.get(which));
+            onComplete.run(availableProfiles.get(which));
+        });
+
+        // create and show the alert dialog
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
 
     @Override
     public void onError(Exception ex) {
@@ -123,45 +145,6 @@ public class LoginActivity extends BaseActivity implements LoginViewModel.Listen
         loginButtonEnabled.set(true);
     }
 
-    private void showProfileDBSelectionDialog(final String protocol, final String host, final int port, final List<String> availableProfiles) {
-        Runnable onComplete = () -> {
-
-            FirebaseInstallations.getInstance().getId().addOnCompleteListener(fid -> {
-                SettingsManager.i().getUserSession().setDeviceId(fid.getResult());
-                SettingsManager.update();
-
-                systemRESTConsumer.registerDevice(this::startSplashActivity, this::onError);
-            });
-        };
-
-        loginButtonEnabled.set(true);
-
-        if (availableProfiles != null && availableProfiles.size() == 1) {
-            SettingsManager.i().getUserSession().setProfileDB(availableProfiles.get(0));
-
-            mViewmodel.loadDepo(codAzienda.get(), protocol, host, port, username.get(), password.get(), onComplete);
-        } else {
-
-            // setup the alert builder
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setTitle(R.string.action_choose_profile_db);
-
-            // add a list
-            String[] profiles = new String[availableProfiles.size()];
-            profiles = availableProfiles
-                            .toArray(profiles);
-
-            builder.setItems(profiles, (dialog, which) -> {
-                SettingsManager.i().getUserSession().setProfileDB(availableProfiles.get(which));
-
-                mViewmodel.loadDepo(codAzienda.get(), protocol, host, port, username.get(), password.get(), onComplete);
-            });
-
-            // create and show the alert dialog
-            AlertDialog dialog = builder.create();
-            dialog.show();
-        }
-    }
 
     private void startSplashActivity() {
         finish();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginModule.java
index 55d76580..649a3533 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginModule.java
@@ -1,11 +1,16 @@
 package it.integry.integrywmsnative.gest.login;
 
+import java.util.concurrent.ExecutorService;
+
 import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.AuthInterceptor;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
-import it.integry.integrywmsnative.gest.login.rest.LoginRESTConsumer;
+import it.integry.integrywmsnative.gest.login.rest.AuthenticationRESTConsumer;
+import it.integry.integrywmsnative.gest.login.rest.RefreshRESTConsumer;
 import it.integry.integrywmsnative.gest.login.viewmodel.LoginViewModel;
 
 @Module(subcomponents = LoginComponent.class)
@@ -13,13 +18,25 @@ public class LoginModule {
 
     @Provides
     @Singleton
-    LoginRESTConsumer provideLoginRESTConsumer() {
-        return new LoginRESTConsumer();
+    AuthenticationRESTConsumer provideAuthenticationRESTConsumer(RESTBuilder restBuilder) {
+        return new AuthenticationRESTConsumer(restBuilder);
     }
 
     @Provides
-    LoginViewModel providesSpedizioneViewModel(SystemRESTConsumer systemRESTConsumer, LoginRESTConsumer loginRESTConsumer) {
-        return new LoginViewModel(systemRESTConsumer, loginRESTConsumer);
+    @Singleton
+    AuthInterceptor provideAuthInterceptor(RefreshRESTConsumer refreshRESTConsumer) {
+        return new AuthInterceptor(refreshRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    RefreshRESTConsumer provideRefreshRESTConsumer(ExecutorService executorService) {
+        return new RefreshRESTConsumer(executorService);
+    }
+
+    @Provides
+    LoginViewModel providesLoginViewModel(SystemRESTConsumer systemRESTConsumer, AuthenticationRESTConsumer authenticationRESTConsumer) {
+        return new LoginViewModel(systemRESTConsumer, authenticationRESTConsumer);
     }
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthTokenClaimsDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthTokenClaimsDTO.java
new file mode 100644
index 00000000..ea3e4c01
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthTokenClaimsDTO.java
@@ -0,0 +1,146 @@
+package it.integry.integrywmsnative.gest.login.dto;
+
+import java.util.HashMap;
+
+public class AuthTokenClaimsDTO {
+
+    private long deviceId;
+    private User userDTO;
+    private HashMap<String, AuthTokenProfileDetails> profilesData;
+
+    public long getDeviceId() {
+        return deviceId;
+    }
+
+    public AuthTokenClaimsDTO setDeviceId(long deviceId) {
+        this.deviceId = deviceId;
+        return this;
+    }
+
+    public User getUserDTO() {
+        return userDTO;
+    }
+
+    public AuthTokenClaimsDTO setUserDTO(User userDTO) {
+        this.userDTO = userDTO;
+        return this;
+    }
+
+    public HashMap<String, AuthTokenProfileDetails> getProfilesData() {
+        return profilesData;
+    }
+
+    public AuthTokenClaimsDTO setProfilesData(HashMap<String, AuthTokenProfileDetails> profilesData) {
+        this.profilesData = profilesData;
+        return this;
+    }
+
+    public class User {
+        private String username;
+        private Object email;
+        private String fullname;
+        private int keyGroup;
+        private boolean attivo;
+        private String type;
+
+        public String getUsername() {
+            return username;
+        }
+
+        public User setUsername(String username) {
+            this.username = username;
+            return this;
+        }
+
+        public Object getEmail() {
+            return email;
+        }
+
+        public User setEmail(Object email) {
+            this.email = email;
+            return this;
+        }
+
+        public String getFullname() {
+            return fullname;
+        }
+
+        public User setFullname(String fullname) {
+            this.fullname = fullname;
+            return this;
+        }
+
+        public int getKeyGroup() {
+            return keyGroup;
+        }
+
+        public User setKeyGroup(int keyGroup) {
+            this.keyGroup = keyGroup;
+            return this;
+        }
+
+        public boolean isAttivo() {
+            return attivo;
+        }
+
+        public User setAttivo(boolean attivo) {
+            this.attivo = attivo;
+            return this;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public User setType(String type) {
+            this.type = type;
+            return this;
+        }
+    }
+
+    public static class AuthTokenProfileDetails {
+        private AuthTokenDepoDetails defaultDepo;
+
+        public AuthTokenDepoDetails getDefaultDepo() {
+            return defaultDepo;
+        }
+
+        public AuthTokenProfileDetails setDefaultDepo(AuthTokenDepoDetails defaultDepo) {
+            this.defaultDepo = defaultDepo;
+            return this;
+        }
+    }
+
+    public static class AuthTokenDepoDetails {
+        private String codMdep;
+        private String descrizione;
+        private String codJfas;
+
+        public String getCodMdep() {
+            return codMdep;
+        }
+
+        public AuthTokenDepoDetails setCodMdep(String codMdep) {
+            this.codMdep = codMdep;
+            return this;
+        }
+
+        public String getDescrizione() {
+            return descrizione;
+        }
+
+        public AuthTokenDepoDetails setDescrizione(String descrizione) {
+            this.descrizione = descrizione;
+            return this;
+        }
+
+        public String getCodJfas() {
+            return codJfas;
+        }
+
+        public AuthTokenDepoDetails setCodJfas(String codJfas) {
+            this.codJfas = codJfas;
+            return this;
+        }
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthenticationJwtResponseDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthenticationJwtResponseDTO.java
new file mode 100644
index 00000000..f51af87e
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthenticationJwtResponseDTO.java
@@ -0,0 +1,48 @@
+package it.integry.integrywmsnative.gest.login.dto;
+
+import java.time.LocalDateTime;
+
+public class AuthenticationJwtResponseDTO {
+
+    private String accessToken;
+    private String refreshToken;
+    private LocalDateTime expiryDate;
+    private long expireIn;
+
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public AuthenticationJwtResponseDTO setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+        return this;
+    }
+
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    public AuthenticationJwtResponseDTO setRefreshToken(String refreshToken) {
+        this.refreshToken = refreshToken;
+        return this;
+    }
+
+    public LocalDateTime getExpiryDate() {
+        return expiryDate;
+    }
+
+    public AuthenticationJwtResponseDTO setExpiryDate(LocalDateTime expiryDate) {
+        this.expiryDate = expiryDate;
+        return this;
+    }
+
+    public long getExpireIn() {
+        return expireIn;
+    }
+
+    public AuthenticationJwtResponseDTO setExpireIn(long expireIn) {
+        this.expireIn = expireIn;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java
index 440dbdc1..d124cce2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java
@@ -4,6 +4,7 @@ public class LoginRequestDTO {
 
     private String username;
     private String password;
+    private String deviceId;
 
     public String getUsername() {
         return username;
@@ -22,4 +23,13 @@ public class LoginRequestDTO {
         this.password = password;
         return this;
     }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public LoginRequestDTO setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/RefreshRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/RefreshRequestDTO.java
new file mode 100644
index 00000000..49958f69
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/RefreshRequestDTO.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.login.dto;
+
+public class RefreshRequestDTO {
+    private String refreshToken;
+
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    public RefreshRequestDTO setRefreshToken(String refreshToken) {
+        this.refreshToken = refreshToken;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/AuthenticationRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/AuthenticationRESTConsumer.java
new file mode 100644
index 00000000..a29bb66d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/AuthenticationRESTConsumer.java
@@ -0,0 +1,114 @@
+package it.integry.integrywmsnative.gest.login.rest;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+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.AuthenticationJwtResponseDTO;
+import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO;
+import it.integry.integrywmsnative.gest.login.dto.LoginRequestDTO;
+import retrofit2.Call;
+import retrofit2.Response;
+
+@Singleton
+public class AuthenticationRESTConsumer extends _BaseRESTConsumer {
+
+
+    private final RESTBuilder restBuilder;
+
+    @Inject
+    public AuthenticationRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
+
+    public void retrieveServerData(String codAzienda, RunnableArgs<LoginAziendaDTO> onComplete, RunnableArgs<Exception> onFailed) {
+
+        String protocol = CommonConst.Login.Azienda.protocol;
+        String host = CommonConst.Login.Azienda.host;
+        int port = CommonConst.Login.Azienda.port;
+
+        AuthenticationRESTConsumerService service = restBuilder.getService(AuthenticationRESTConsumerService.class, protocol, host, port, false, true);
+        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, Exception e) {
+                onFailed.run(e);
+            }
+        });
+    }
+
+    public void me(RunnableArgs<Object> onComplete, RunnableArgs<Exception> onFailed) {
+        AuthenticationRESTConsumerService service = restBuilder.getService(AuthenticationRESTConsumerService.class);
+
+        service.me()
+                .enqueue(new ManagedErrorCallback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
+                        analyzeAnswer(response, "me", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Object>> call, Exception e) {
+                        onFailed.run(e);
+                    }
+                });
+    }
+
+
+    public void authenticate(String protocol, String host, int port, String username, String password, String profileDb, String deviceSalt, RunnableArgs<AuthenticationJwtResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        AuthenticationRESTConsumerService service = restBuilder.getService(AuthenticationRESTConsumerService.class, protocol, host, port, false);
+
+        LoginRequestDTO loginRequestDTO = new LoginRequestDTO()
+                .setUsername(username)
+                .setPassword(password)
+                .setDeviceId(deviceSalt);
+
+        service
+                .loginNew(profileDb, loginRequestDTO)
+                .enqueue(new ManagedErrorCallback<>() {
+
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<AuthenticationJwtResponseDTO>> call, Response<ServiceRESTResponse<AuthenticationJwtResponseDTO>> response) {
+                        analyzeAnswer(response, "login", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<AuthenticationJwtResponseDTO>> call, final Exception e) {
+                        onFailed.run(e);
+                    }
+                });
+    }
+
+
+
+
+    public void retrieveAvailableProfiles(String protocol, String host, int port, String username, String password, RunnableArgs<List<String>> onComplete, RunnableArgs<Exception> onFailed) {
+        AuthenticationRESTConsumerService service = restBuilder.getService(AuthenticationRESTConsumerService.class, protocol, host, port, false);
+
+        service.retreiveAvailableProfiles(username, password)
+                .enqueue(new ManagedErrorCallback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<List<String>>> call, Response<ServiceRESTResponse<List<String>>> response) {
+                        analyzeAnswer(response, "retrieveAvailableProfiles", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<List<String>>> call, Exception e) {
+                        onFailed.run(e);
+                    }
+                });
+    }
+
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/AuthenticationRESTConsumerService.java
similarity index 55%
rename from app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java
rename to app/src/main/java/it/integry/integrywmsnative/gest/login/rest/AuthenticationRESTConsumerService.java
index f2cfb277..e7d20492 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/AuthenticationRESTConsumerService.java
@@ -1,17 +1,20 @@
 package it.integry.integrywmsnative.gest.login.rest;
 
 
+import java.util.List;
+
 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.AuthenticationJwtResponseDTO;
 import it.integry.integrywmsnative.gest.login.dto.LoginRequestDTO;
+import it.integry.integrywmsnative.gest.login.dto.LoginResponseDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
 
-public interface LoginRESTConsumerService {
+public interface AuthenticationRESTConsumerService {
 
 
     @GET("loginAziendaWms")
@@ -20,4 +23,13 @@ public interface LoginRESTConsumerService {
     @POST("loginWeb")
     Call<ServiceRESTResponse<LoginResponseDTO>> login(@Body LoginRequestDTO loginRequestDTO);
 
+    @POST("auth/login")
+    Call<ServiceRESTResponse<AuthenticationJwtResponseDTO>> loginNew(@Query("profileDb") String profileDb, @Body LoginRequestDTO loginRequestDTO);
+
+    @GET("auth/me")
+    Call<ServiceRESTResponse<Object>> me();
+
+    @GET("users/availableProfiles")
+    Call<ServiceRESTResponse<List<String>>> retreiveAvailableProfiles(@Query("username") String username, @Query("password") String password);
+
 }
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
deleted file mode 100644
index 67a9070e..00000000
--- a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package it.integry.integrywmsnative.gest.login.rest;
-
-import android.util.Log;
-
-import javax.inject.Singleton;
-
-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.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 retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-@Singleton
-public class LoginRESTConsumer extends _BaseRESTConsumer {
-
-
-    public void retrieveServerData(String codAzienda, RunnableArgs<LoginAziendaDTO> onComplete, RunnableArgs<Exception> onFailed) {
-
-        String protocol = CommonConst.Login.Azienda.protocol;
-        String host = CommonConst.Login.Azienda.host;
-        int port = CommonConst.Login.Azienda.port;
-
-        LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, protocol, host, port, false, true);
-        service.loginAzienda(codAzienda).enqueue(new Callback<>() {
-            @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 authenticate(String protocol, String host, int port, String username, String password, RunnableArgs<LoginResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, protocol, host, port, false);
-
-        LoginRequestDTO loginRequestDTO = new LoginRequestDTO()
-                .setUsername(username)
-                .setPassword(password);
-
-        service.login(loginRequestDTO).enqueue(new Callback<>() {
-
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<LoginResponseDTO>> call, Response<ServiceRESTResponse<LoginResponseDTO>> response) {
-                analyzeAnswer(response, "Login", onComplete, onFailed);
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<LoginResponseDTO>> call, final Throwable t) {
-                Log.e("Login", t.toString());
-                onFailed.run(new Exception(t));
-            }
-        });
-    }
-
-
-}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/RefreshRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/RefreshRESTConsumer.java
new file mode 100644
index 00000000..56c1be3d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/RefreshRESTConsumer.java
@@ -0,0 +1,95 @@
+package it.integry.integrywmsnative.gest.login.rest;
+
+import com.google.gson.Gson;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.rest.HttpInterceptor;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityGson;
+import it.integry.integrywmsnative.gest.login.dto.AuthenticationJwtResponseDTO;
+import it.integry.integrywmsnative.gest.login.dto.RefreshRequestDTO;
+import okhttp3.OkHttpClient;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+@Singleton
+public class RefreshRESTConsumer extends _BaseRESTConsumer {
+
+    private final ExecutorService executorService;
+
+    public RefreshRESTConsumer(ExecutorService executorService) {
+        this.executorService = executorService;
+    }
+
+    public AuthenticationJwtResponseDTO makeSynchronousRefreshTokenRequest() throws Exception {
+        RefreshRESTConsumerService service = getService(
+                RefreshRESTConsumerService.class,
+                SettingsManager.i().getServer().getProtocol(),
+                SettingsManager.i().getServer().getHost(),
+                SettingsManager.i().getServer().getPort(),
+                true,
+                true,
+                30);
+
+        RefreshRequestDTO refreshRequest = new RefreshRequestDTO()
+                .setRefreshToken(SettingsManager.i().getUserSession().getRefreshToken());
+
+        Response<ServiceRESTResponse<AuthenticationJwtResponseDTO>> response = service
+                .refresh(refreshRequest)
+                .execute();
+
+        return analyzeAnswer(response, "refreshToken");
+    }
+
+    public void makeRefreshTokenRequest(final Runnable onComplete, final RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                makeSynchronousRefreshTokenRequest();
+
+                if (onComplete != null)
+                    onComplete.run();
+
+            } catch (Exception ex) {
+                if (onError != null) onError.run(ex);
+            }
+        });
+    }
+
+
+    private <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors, boolean addEmsApi, int timeout) {
+        OkHttpClient.Builder clientBuilder = RESTBuilder.getDefaultHttpClient();
+
+        clientBuilder.connectTimeout(timeout, TimeUnit.SECONDS);
+        clientBuilder.readTimeout(timeout, TimeUnit.SECONDS);
+        clientBuilder.writeTimeout(timeout, TimeUnit.SECONDS);
+
+        clientBuilder.retryOnConnectionFailure(true);
+
+        if (addInterceptors) clientBuilder.addInterceptor(new HttpInterceptor());
+
+        OkHttpClient client = clientBuilder.build();
+
+        String endpoint = protocol + "://" + host + (port > 0 ? ":" + port : "") + "/" + (addEmsApi ? "ems-api/" : "");
+
+
+        Gson gson = UtilityGson.createObject();
+
+        Retrofit retrofit = new Retrofit.Builder()
+                .addConverterFactory(GsonConverterFactory.create(gson))
+                .baseUrl(endpoint)
+                .client(client)
+                .build();
+
+        return retrofit.create(service);
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/RefreshRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/RefreshRESTConsumerService.java
new file mode 100644
index 00000000..257024a6
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/RefreshRESTConsumerService.java
@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.gest.login.rest;
+
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.gest.login.dto.AuthenticationJwtResponseDTO;
+import it.integry.integrywmsnative.gest.login.dto.RefreshRequestDTO;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.POST;
+
+public interface RefreshRESTConsumerService {
+
+
+
+    @POST("auth/refresh")
+    Call<ServiceRESTResponse<AuthenticationJwtResponseDTO>> refresh(@Body RefreshRequestDTO refreshRequestDTO);
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java
index 9bdf9748..74d21fe2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java
@@ -1,41 +1,86 @@
 package it.integry.integrywmsnative.gest.login.viewmodel;
 
-import com.annimon.stream.Stream;
+import com.google.firebase.installations.FirebaseInstallations;
+import com.google.gson.Gson;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
+import it.integry.integrywmsnative.core.authentication.JwtUtils;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityServer;
 import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.gest.login.dto.AuthTokenClaimsDTO;
 import it.integry.integrywmsnative.gest.login.exception.InvalidServerCodAziendaException;
 import it.integry.integrywmsnative.gest.login.exception.InvalidUserDepositException;
-import it.integry.integrywmsnative.gest.login.rest.LoginRESTConsumer;
+import it.integry.integrywmsnative.gest.login.rest.AuthenticationRESTConsumer;
 
 public class LoginViewModel {
 
 
     private final SystemRESTConsumer mSystemRESTConsumer;
-    private final LoginRESTConsumer mLoginRESTConsumer;
+    private final AuthenticationRESTConsumer mAuthenticationRESTConsumer;
 
     private Listener mListener;
 
     @Inject
-    public LoginViewModel(SystemRESTConsumer systemRESTConsumer, LoginRESTConsumer loginRESTConsumer) {
+    public LoginViewModel(SystemRESTConsumer systemRESTConsumer, AuthenticationRESTConsumer authenticationRESTConsumer) {
         this.mSystemRESTConsumer = systemRESTConsumer;
-        this.mLoginRESTConsumer = loginRESTConsumer;
+        this.mAuthenticationRESTConsumer = authenticationRESTConsumer;
     }
 
 
     public void login(String codAzienda, String username, String password) {
         this.sendOnLoadingStarted();
 
-        mLoginRESTConsumer.retrieveServerData(codAzienda, value -> {
+        retrieveServerData(codAzienda, (protocol, host, port) -> {
+
+            UtilityServer.isEmsApiAvailable(protocol, host, port, () -> {
+
+                FirebaseInstallations.getInstance().getId().addOnCompleteListener(fid -> {
+
+                    retrieveAvailableProfiles(protocol, host, port, username, password, selectedProfile -> {
+                        SettingsManager.i().createUserSession();
+
+                        authenticate(protocol, host, port, username, password, selectedProfile, fid.getResult(), fullName -> {
+
+                            SettingsManager.i().getUser()
+                                    .setFullname(fullName);
+
+                            SettingsManager.i().getServer()
+                                    .setCodAzienda(codAzienda)
+                                    .setProtocol(protocol)
+                                    .setHost(host)
+                                    .setPort(port);
+
+                            loadDepo(() -> {
+                                SettingsManager.update();
+                                this.sendOnLoginCompleted(fullName);
+                            });
+
+                        });
+
+                    });
+
+                });
+
+            }, this::sendError);
+        });
+    }
+
+
+    private void retrieveServerData(String codAzienda, RunnableArgsss<String, String, Integer> onComplete) {
+        mAuthenticationRESTConsumer.retrieveServerData(codAzienda, value -> {
 
             final String serverEndpoint = value.getEndpointRestApi();
 
@@ -52,40 +97,59 @@ public class LoginViewModel {
             final String host = u.getHost();
             final int port = u.getPort();
 
-            UtilityServer.isEmsApiAvailable(protocol, host, port, () -> {
+            onComplete.run(protocol, host, port);
 
-                    mLoginRESTConsumer.authenticate(protocol, host, port, username, password, loginDTO -> {
-
-                        SettingsManager.i().createUserSession();
-                        SettingsManager.i().getUser().setFullname(!UtilityString.isNullOrEmpty(loginDTO.getFullName()) ? loginDTO.getFullName() : username);
-
-                        List<String> availableProfiles = null;
-                        if(loginDTO.getAvailableProfiles() != null && !loginDTO.getAvailableProfiles().isEmpty()) {
-                            availableProfiles = Stream.of(loginDTO.getAvailableProfiles())
-                                    .sorted()
-                                    .toList();
-                        }
-
-                        this.sendOnLoginCompleted(protocol, host, port, loginDTO.getFullName(), availableProfiles);
-                    }, this::sendError);
-
-
-                }, this::sendError);
         }, ex -> {
             this.sendError(new InvalidServerCodAziendaException(codAzienda, ex));
         });
     }
 
+    private void retrieveAvailableProfiles(String protocol, String host, int port, String username, String password, RunnableArgs<String> onComplete) {
+        mAuthenticationRESTConsumer.retrieveAvailableProfiles(protocol, host, port, username, password, availableProfiles -> {
 
-    public void loadDepo(String codAzienda, String protocol, String host, int port, String username, String password, Runnable onComplete) {
+            if (availableProfiles == null || availableProfiles.isEmpty()) {
+                this.sendError(new Exception("Non è stato trovato alcun profilo per l'utente: " + username));
+                return;
+            }
 
-        SettingsManager.i().getServer().setCodAzienda(codAzienda);
-        SettingsManager.i().getServer().setProtocol(protocol);
-        SettingsManager.i().getServer().setHost(host);
-        SettingsManager.i().getServer().setPort(port);
+            if (availableProfiles.size() == 1) {
+                onComplete.run(availableProfiles.get(0));
 
-        SettingsManager.i().getUser().setUsername(username);
-        SettingsManager.i().getUser().setPassword(password);
+            } else {
+                availableProfiles = availableProfiles.stream()
+                        .sorted()
+                        .collect(Collectors.toList());
+
+                this.sendRequestProfileSelection(availableProfiles, onComplete);
+            }
+        }, this::sendError);
+    }
+
+    private void authenticate(String protocol, String host, int port, String username, String password, String profileDb, String deviceSalt, RunnableArgs<String> onComplete) {
+        mAuthenticationRESTConsumer.authenticate(protocol, host, port, username, password, profileDb, deviceSalt, sessionData -> {
+
+            var claims = JwtUtils.parseJwt(sessionData.getAccessToken());
+            var detailsMap = claims.get("details", LinkedHashMap.class);
+
+            Gson gson = new Gson();
+            String jsonString = gson.toJson(detailsMap);
+            AuthTokenClaimsDTO claimsDetails = gson.fromJson(jsonString, AuthTokenClaimsDTO.class);
+
+
+            SettingsManager.i().getUserSession()
+                    .setProfileDB(profileDb)
+                    .setDeviceId(deviceSalt)
+                    .setAccessToken(sessionData.getAccessToken())
+                    .setAccessTokenExpiryDate(UtilityDate.toLocalDateTime(claims.getExpiration()))
+                    .setRefreshToken(sessionData.getRefreshToken())
+                    .setRefreshTokenExpiryDate(sessionData.getExpiryDate());
+
+            onComplete.run(UtilityString.isNull(claimsDetails.getUserDTO().getFullname(), claimsDetails.getUserDTO().getUsername()));
+
+        }, this::sendError);
+    }
+
+    public void loadDepo(Runnable onComplete) {
 
         this.mSystemRESTConsumer.getAvailableCodMdeps(availableCodMdeps -> {
             SettingsManager.iDB().setAvailableCodMdep(availableCodMdeps);
@@ -97,7 +161,6 @@ public class LoginViewModel {
 
             SettingsManager.i().getUserSession().setDepo(availableCodMdeps.get(0));
 
-
             if (onComplete != null) onComplete.run();
         }, this::sendError);
     }
@@ -111,9 +174,14 @@ public class LoginViewModel {
         if (this.mListener != null) mListener.onLoadingEnded();
     }
 
-    private void sendOnLoginCompleted(String protocol, String host, int port, String fullName, List<String> availableProfiles) {
+    private void sendOnLoginCompleted(String fullName) {
         if (this.mListener != null)
-            mListener.onLoginCompleted(protocol, host, port, fullName, availableProfiles);
+            mListener.onLoginCompleted(fullName);
+    }
+
+    private void sendRequestProfileSelection(List<String> availableProfiles, RunnableArgs<String> onComplete) {
+        if (this.mListener != null)
+            mListener.requestProfileSelection(availableProfiles, onComplete);
     }
 
     private void sendError(Exception ex) {
@@ -128,7 +196,9 @@ public class LoginViewModel {
     public interface Listener extends ILoadingListener {
         void onError(Exception ex);
 
-        void onLoginCompleted(String protocol, String host, int port, String fullName, List<String> availableProfiles);
+        void onLoginCompleted(String fullName);
+
+        void requestProfileSelection(List<String> availableProfiles, RunnableArgs<String> onComplete);
     }
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
index 58603a94..4d1b416c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
@@ -49,6 +49,7 @@ import it.integry.integrywmsnative.databinding.ActivityMainBinding;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
 import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
+import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoView;
 
 public class MainActivity extends BaseActivity
         implements NavigationView.OnNavigationItemSelectedListener, IPoppableActivity {
@@ -89,7 +90,7 @@ public class MainActivity extends BaseActivity
         mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_main, null, false);
         setContentView(mBinding.getRoot());
 
-        updatesManager.init(this, systemRESTConsumer);
+        updatesManager.executeCheck(this, false);
         UtilityContext.initMainActivity(this);
 
         setSupportActionBar(mBinding.appBarMain.toolbar);
@@ -185,6 +186,10 @@ public class MainActivity extends BaseActivity
         } else {
             if (id == R.id.nav_home) {
                 this.pop();
+            } else if (id == R.id.nav_extra_info) {
+
+                this.showExtraInfoDialog();
+
             } else if (id == R.id.nav_settings) {
                 fragment = new MainSettingsFragment();
                 this.adaptViewToFragment(fragment);
@@ -203,6 +208,11 @@ public class MainActivity extends BaseActivity
         return true;
     }
 
+    private void showExtraInfoDialog() {
+        DialogExtraInfoView.newInstance()
+                .show(getSupportFragmentManager(), "extra-info");
+    }
+
 
     private void initGestMenu() {
         Menu menu = mBinding.navView.getMenu();
@@ -236,6 +246,8 @@ public class MainActivity extends BaseActivity
 
 
         SubMenu subMenu = menu.addSubMenu(R.string.other);
+        subMenu.add(R.id.nav_extra_info, R.id.nav_extra_info, 0, R.string.informations)
+                .setIcon(R.drawable.ic_information_outline_24dp);
         subMenu.add(R.id.nav_home, R.id.nav_settings, 0, R.string.general_settings)
                 .setIcon(R.drawable.ic_settings_24dp);
         subMenu.add(R.id.nav_logout, R.id.nav_logout, 0, R.string.logout)
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/OrdiniUscitaElencoModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoModule.java
index 1158283f..4449fdd9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoModule.java
@@ -4,6 +4,7 @@ import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
@@ -14,8 +15,8 @@ public class OrdiniUscitaElencoModule {
 
     @Singleton
     @Provides
-    OrdiniUscitaElencoRESTConsumer providesOrdiniUscitaElencoRESTConsumer() {
-        return new OrdiniUscitaElencoRESTConsumer();
+    OrdiniUscitaElencoRESTConsumer providesOrdiniUscitaElencoRESTConsumer(RESTBuilder restBuilder) {
+        return new OrdiniUscitaElencoRESTConsumer(restBuilder);
     }
 
     @Provides
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..c3e41bfa 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,16 +12,22 @@ 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
 public class OrdiniUscitaElencoRESTConsumer extends _BaseRESTConsumer {
 
+    private RESTBuilder restBuilder;
+
+    public OrdiniUscitaElencoRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
+
     public void getOrdiniFromCommessaCollo(String codMdep, MtbColt testataCollo, RunnableArgs<List<DtbOrdt>> onComplete, RunnableArgs<Exception> onFailed) {
-        OrdiniUscitaElencoRESTConsumerService service = RESTBuilder.getService(OrdiniUscitaElencoRESTConsumerService.class);
+        OrdiniUscitaElencoRESTConsumerService service = restBuilder.getService(OrdiniUscitaElencoRESTConsumerService.class);
         service.getOrdiniInCommessaCollo(
                 testataCollo.getDataColloS(),
                 testataCollo.getNumCollo(),
@@ -27,7 +35,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 +44,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..2ac77b46 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
@@ -360,17 +373,20 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
                                 .setPartitaMag(resultDTO.getPartitaMag())
                                 .setDataScad(resultDTO.getDataScad());
 
-                        this.onLoadingStarted();
                         onComplete.run(pickedQuantityDTO, shouldCloseLU);
                     })
-                    .setOnAbort(this::onLoadingEnded)
+                    .setOnAbort(() -> {
+                        onComplete.run(null, false);
+                    })
                     .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
     @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/PickingLiberoModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoModule.java
index ebcd498d..43ddcd44 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoModule.java
@@ -1,9 +1,12 @@
 package it.integry.integrywmsnative.gest.picking_libero;
 
+import java.util.concurrent.ExecutorService;
+
 import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
@@ -18,22 +21,27 @@ public class PickingLiberoModule {
 
     @Provides
     @Singleton
-    PickingLiberoViewModel providesPickingLiberoViewModel(ArticoloRESTConsumer articoloRESTConsumer,
+    PickingLiberoViewModel providesPickingLiberoViewModel(ExecutorService executorService,
+                                                          ArticoloRESTConsumer articoloRESTConsumer,
                                                           ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
                                                           BarcodeRESTConsumer barcodeRESTConsumer,
                                                           PosizioniRESTConsumer posizioniRESTConsumer,
                                                           GiacenzaRESTConsumer giacenzaRESTConsumer,
                                                           MagazzinoAutomaticoRESTConsumer magazzinoAutomaticoRESTConsumer,
                                                           ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
-                                                          ColliSpedizioneRESTConsumer colliSpedizioneRESTConsumer
+                                                          ColliSpedizioneRESTConsumer colliSpedizioneRESTConsumer,
+                                                          ColliDataRecoverService colliDataRecoverService
     ) {
-        return new PickingLiberoViewModel(articoloRESTConsumer,
+        return new PickingLiberoViewModel(
+                executorService,
+                articoloRESTConsumer,
                 colliMagazzinoRESTConsumer,
                 barcodeRESTConsumer,
                 posizioniRESTConsumer,
                 giacenzaRESTConsumer,
                 magazzinoAutomaticoRESTConsumer,
                 colliLavorazioneRESTConsumer,
-                colliSpedizioneRESTConsumer);
+                colliSpedizioneRESTConsumer,
+                colliDataRecoverService);
     }
 }
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..3a72013a 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
@@ -7,13 +7,17 @@ import com.annimon.stream.Stream;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
-import it.integry.integrywmsnative.core.exception.InvalidCodMdepException;
+import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
+import it.integry.integrywmsnative.core.exception.InvalidCodMdepLUException;
 import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
 import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
@@ -24,12 +28,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 +51,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;
@@ -63,12 +70,14 @@ public class PickingLiberoViewModel {
 
     private MtbColt mCurrentMtbColt = null;
 
+    private final ExecutorService executorService;
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
     private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
     private final BarcodeRESTConsumer mBarcodeRESTConsumer;
     private final PosizioniRESTConsumer mPosizioniRESTConsumer;
     private final GiacenzaRESTConsumer mGiacenzaRESTConsumer;
     private final MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer;
+    private final ColliDataRecoverService mColliDataRecoverService;
 
     private ColliScaricoRESTConsumerInterface mColliScaricoRESTConsumer;
     private final ColliLavorazioneRESTConsumer mColliLavorazioneRESTConsumer;
@@ -76,21 +85,28 @@ public class PickingLiberoViewModel {
 
     private boolean mFlagAskCliente;
     private boolean mFlagAskLineaProd;
+    private boolean mFlagAskCommessa;
     private GestioneEnum mDefaultGestione;
 
+    private JtbComt mDefaultCommessa;
+
 
     private Listener mListener;
+    private Integer mMtbColtSessionID;
 
 
     @Inject
-    public PickingLiberoViewModel(ArticoloRESTConsumer articoloRESTConsumer,
+    public PickingLiberoViewModel(ExecutorService executorService,
+                                  ArticoloRESTConsumer articoloRESTConsumer,
                                   ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
                                   BarcodeRESTConsumer barcodeRESTConsumer,
                                   PosizioniRESTConsumer posizioniRESTConsumer,
                                   GiacenzaRESTConsumer giacenzaRESTConsumer,
                                   MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer,
                                   ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
-                                  ColliSpedizioneRESTConsumer colliSpedizioneRESTConsumer) {
+                                  ColliSpedizioneRESTConsumer colliSpedizioneRESTConsumer,
+                                  ColliDataRecoverService colliDataRecoverService) {
+        this.executorService = executorService;
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
@@ -99,12 +115,14 @@ public class PickingLiberoViewModel {
         this.mMagazzinoAutomaticoRESTConsumer = mMagazzinoAutomaticoRESTConsumer;
         this.mColliLavorazioneRESTConsumer = colliLavorazioneRESTConsumer;
         this.mColliSpedizioneRESTConsumer = colliSpedizioneRESTConsumer;
+        this.mColliDataRecoverService = colliDataRecoverService;
     }
 
 
-    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 +160,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 {
@@ -179,26 +197,38 @@ public class PickingLiberoViewModel {
                     .map(MvwSitArtUdcDetInventario::toMtbColr)
                     .toList();
 
-            this.sendArtSelectionRequest(mtbColrs, null, selectedMtbColrs -> {
+            List<MtbColr> selectedMtbColrs = null;
+            try {
+                selectedMtbColrs = this.sendArtSelectionRequest(mtbColrs, null);
+            } catch (InterruptedException e) {
+                this.sendError(e);
+                return;
+            }
 
-                final List<MagazzinoAutomaticoPickItemRequestDTO> magazzinoAutomaticoPickItemRequestDTOList = new ArrayList<>();
-                for (MtbColr selectedArt : selectedMtbColrs) {
-                    MagazzinoAutomaticoPickItemRequestDTO itemDto = new MagazzinoAutomaticoPickItemRequestDTO(selectedArt.getCodMart())
-                            .setQtaTot(selectedArt.getQtaCol())
-                            .setNumCnf(selectedArt.getNumCnf())
-                            .setUntMis(selectedArt.getUntMis());
+            if (selectedMtbColrs == null) {
+                this.sendOnLoadingEnded();
+                return;
+            }
 
-                    magazzinoAutomaticoPickItemRequestDTOList.add(itemDto);
-                }
+            final List<MagazzinoAutomaticoPickItemRequestDTO> magazzinoAutomaticoPickItemRequestDTOList = new ArrayList<>();
+            for (MtbColr selectedArt : selectedMtbColrs) {
+                MagazzinoAutomaticoPickItemRequestDTO itemDto = new MagazzinoAutomaticoPickItemRequestDTO(selectedArt.getCodMart())
+                        .setQtaTot(selectedArt.getQtaCol())
+                        .setNumCnf(selectedArt.getNumCnf())
+                        .setUntMis(selectedArt.getUntMis());
 
-                var magazzinoAutomaticoPickRequest = new MagazzinoAutomaticoPickItemsRequestDTO()
-                        .setShouldCreateUDS(true)
-                        .setDefaultGestioneOfNewUDS(mDefaultGestione.getText())
-                        .setItemsToPick(magazzinoAutomaticoPickItemRequestDTOList);
+                magazzinoAutomaticoPickItemRequestDTOList.add(itemDto);
+            }
 
-                mMagazzinoAutomaticoRESTConsumer.pickItems(mtbDepoPosizione,
-                        magazzinoAutomaticoPickRequest, onComplete, this::sendError);
-            }, this::sendOnLoadingEnded);
+            var magazzinoAutomaticoPickRequest = new MagazzinoAutomaticoPickItemsRequestDTO()
+                    .setShouldCreateUDS(true)
+                    .setDefaultGestioneOfNewUDS(mDefaultGestione.getText())
+                    .setItemsToPick(magazzinoAutomaticoPickItemRequestDTOList);
+
+            mMagazzinoAutomaticoRESTConsumer.pickItems(mtbDepoPosizione,
+                    magazzinoAutomaticoPickRequest, onComplete, this::sendError);
+
+            this.sendOnLoadingEnded();
 
         }, this::sendError);
 
@@ -208,7 +238,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 {
@@ -222,7 +252,7 @@ public class PickingLiberoViewModel {
 
                     if (codMdepIsValid) {
                         pickMerceULtoUL(mtbColt, articolo, onComplete);
-                    } else this.sendError(new InvalidCodMdepException());
+                    } else this.sendError(new InvalidCodMdepLUException());
 
                 }, this::sendError);
             } else {
@@ -253,7 +283,7 @@ public class PickingLiberoViewModel {
 
                 if (codMdepIsValid) {
                     pickMerceULtoUL(mtbColtScanned, onComplete);
-                } else this.sendError(new InvalidCodMdepException());
+                } else this.sendError(new InvalidCodMdepLUException());
 
             } else {
                 this.sendError(new NoLUFoundException());
@@ -291,7 +321,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 +346,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 +363,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();
 
@@ -365,6 +405,8 @@ public class PickingLiberoViewModel {
 
 
         mColliScaricoRESTConsumer.createUDS(createUDSRequest, mtbColt -> {
+            mMtbColtSessionID = mColliDataRecoverService.startNewSession(mtbColt, null);
+
             mtbColt
                     .setMtbColr(new ObservableArrayList<>());
 
@@ -509,6 +551,11 @@ public class PickingLiberoViewModel {
                 true,
                 true,
                 (pickedQuantityDTO, shouldCloseLU) -> {
+                    if (pickedQuantityDTO == null) {
+                        this.sendOnLoadingEnded();
+                        return;
+                    }
+
                     this.saveNewRow(pickingObjectDTO,
                             pickedQuantityDTO.getNumCnf(),
                             pickedQuantityDTO.getQtaCnf(),
@@ -524,92 +571,67 @@ public class PickingLiberoViewModel {
     }
 
     private void pickMerceULtoUL(MtbColt sourceMtbColt, MtbAart mtbAart, Runnable onComplete) {
-        List<MtbColr> mtbColrsToPick = Stream.of(sourceMtbColt.getMtbColr())
-                .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaCol(), BigDecimal.ZERO))
-                .toList();
+        executorService.execute(() -> {
 
-        this.sendArtSelectionRequest(mtbColrsToPick, mtbAart, pickedAarts -> {
-            List<MtbColr> destNewMtbColr = new ArrayList<>();
+            try {
+                List<MtbColr> mtbColrsToPick = sourceMtbColt.getMtbColr().stream()
+                        .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaCol(), BigDecimal.ZERO))
+                        .collect(Collectors.toList());
 
-            if (!pickedAarts.isEmpty()) {
-                askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> {
-                    if (!destNewMtbColr.isEmpty()) {
-                        MtbColt clonedTestata = (MtbColt) this.mCurrentMtbColt.clone();
-                        clonedTestata.setOperation(CommonModelConsts.OPERATION.UPDATE);
+                List<MtbColr> pickedAarts = this.sendArtSelectionRequest(mtbColrsToPick, mtbAart);
 
-                        ObservableArrayList<MtbColr> mtbColrObservableField = new ObservableArrayList<>();
+                if (pickedAarts == null) {
+                    this.sendOnLoadingEnded();
+                    return;
+                }
 
-                        for (int i = 0; i < destNewMtbColr.size(); i++) {
-                            MtbColr cloneMtbColr = (MtbColr) destNewMtbColr.get(i).clone();
+                List<MtbColr> mtbColrsToMove = new ArrayList<>();
 
-                            cloneMtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
+                if (!pickedAarts.isEmpty()) {
+                    for (var pickedArt : pickedAarts) {
+                        var mtbColr = askSingleQuantity(pickedArt);
 
-                            cloneMtbColr
-                                    .setGestioneRif(cloneMtbColr.getGestione())
-                                    .setGestione((String) null)
-
-                                    .setSerColloRif(cloneMtbColr.getSerCollo())
-                                    .setSerCollo(null)
-
-                                    .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();
+                        if (mtbColr != null)
+                            mtbColrsToMove.add(mtbColr);
                     }
-                }, onComplete);
-            } else {
-                onComplete.run();
+
+                    if (!mtbColrsToMove.isEmpty()) {
+
+                        if (this.mDefaultCommessa != null)
+                            mtbColrsToMove.forEach(x -> x.setCodJcom(this.mDefaultCommessa.getCodJcom()));
+
+                        MtbColt clonedSourceTestata = (MtbColt) sourceMtbColt.clone();
+                        clonedSourceTestata.getMtbColr().clear();
+                        clonedSourceTestata.getMtbColr().addAll(mtbColrsToMove);
+
+                        mColliMagazzinoRESTConsumer.spostaArtsTraUL(clonedSourceTestata,
+                                this.mCurrentMtbColt, true, (generatedMtbColrs) -> {
+
+                                    mCurrentMtbColt.getMtbColr().addAll(generatedMtbColrs);
+
+                                    this.sendOnRowSaved();
+                                    this.sendOnLoadingEnded();
+                                    onComplete.run();
+                                }, this::sendError);
+
+                    } else {
+                        onComplete.run();
+                        this.sendOnLoadingEnded();
+                    }
+
+                } else {
+                    onComplete.run();
+                    this.sendOnLoadingEnded();
+                }
+
+            } catch (InterruptedException e) {
+                this.sendError(e);
             }
-        }, this::sendOnLoadingEnded);
 
+        });
     }
 
-    private void askQuantities(Iterator<MtbColr> sourceMtbColrs, List<MtbColr> destMtbColr, Runnable onComplete, Runnable onAbort) {
-        if (sourceMtbColrs.hasNext()) {
-            askSingleQuantity(sourceMtbColrs.next(), mtbColr -> {
-                destMtbColr.add(mtbColr);
-                askQuantities(sourceMtbColrs, destMtbColr, onComplete, onAbort);
-            }, onAbort);
-        } else {
-            onComplete.run();
-        }
-    }
-
-    private void askSingleQuantity(MtbColr mtbColr, RunnableArgs<MtbColr> onComplete, Runnable onAbort) {
+    private MtbColr askSingleQuantity(MtbColr mtbColr) throws InterruptedException {
 
         MtbColt sourceMtbColt = new MtbColt()
                 .setNumCollo(mtbColr.getNumCollo())
@@ -628,6 +650,8 @@ public class PickingLiberoViewModel {
                         new PickDataDTO()
                                 .setSourceMtbColt(sourceMtbColt));
 
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        AtomicReference<MtbColr> result = new AtomicReference<>();
 
         this.sendOnItemDispatched(
                 pickingObjectDTO,
@@ -647,6 +671,10 @@ public class PickingLiberoViewModel {
                 false,
                 false,
                 (pickedQuantityDTO, shouldCloseLU) -> {
+                    if (pickedQuantityDTO == null) {
+                        countDownLatch.countDown();
+                        return;
+                    }
 
                     mtbColr
                             .setPartitaMag(pickedQuantityDTO.getPartitaMag())
@@ -654,16 +682,21 @@ public class PickingLiberoViewModel {
                             .setQtaCol(pickedQuantityDTO.getQtaTot())
                             .setQtaCnf(pickedQuantityDTO.getQtaCnf())
                             .setNumCnf(pickedQuantityDTO.getNumCnf())
-                            .setDatetimeRow(UtilityDate.getDateInstance());
+                            .setDatetimeRow(UtilityDate.getDateInstance())
+                            .setMtbAart(pickingObjectDTO.getMtbAart());
 
-                    onComplete.run(mtbColr);
+                    result.set(mtbColr);
+                    countDownLatch.countDown();
                 });
+
+
+        countDownLatch.await();
+        return result.get();
     }
 
 
     public void saveNewRow(PickingObjectDTO pickingObjectDTO, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
-        new Thread(this::sendOnLoadingStarted).start();
-
+        this.sendOnLoadingStarted();
 
         final MtbColr mtbColr = new MtbColr()
                 .setCodMart(pickingObjectDTO.getMtbAart().getCodMart())
@@ -673,7 +706,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 +784,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()) &&
@@ -791,8 +825,12 @@ public class PickingLiberoViewModel {
                     mtbColrToUpdate.getDataScadPartita(),
                     false,
                     false,
-                    true,
+                    false,
                     (pickedQuantityDTO, shouldCloseLU) -> {
+                        if (pickedQuantityDTO == null) {
+                            this.sendOnLoadingEnded();
+                            return;
+                        }
 
                         this.saveEditedRow(mtbColrToUpdate,
                                 pickedQuantityDTO.getNumCnf(),
@@ -886,10 +924,14 @@ public class PickingLiberoViewModel {
         }
 
         this.sendOnLoadingStarted();
+        this.mDefaultCommessa = null;
 
         mColliMagazzinoRESTConsumer.canULBeDeleted(mCurrentMtbColt, canBeDeleted -> {
             if (canBeDeleted) {
                 deleteLU(() -> {
+                    if (mMtbColtSessionID != null)
+                        this.mColliDataRecoverService.closeSession(mMtbColtSessionID);
+
                     this.sendLUClosed();
                     this.sendOnLoadingEnded();
 
@@ -899,7 +941,31 @@ public class PickingLiberoViewModel {
             } else {
 
                 this.mColliMagazzinoRESTConsumer.assegnaLottoSuColloScarico(mCurrentMtbColt, () -> {
-                    this.mColliMagazzinoRESTConsumer.updateDataFine(mCurrentMtbColt, () -> {
+
+                    var closeUDSRequest = new CloseUDSRequestDTO()
+                            .setMtbColt(mCurrentMtbColt);
+
+                    if (this.mDefaultGestione == GestioneEnum.LAVORAZIONE && SettingsManager.iDB().isProduzioneGeneraDocScar()) {
+
+                        if(SettingsManager.iDB().getInternalCodAnags() == null || SettingsManager.iDB().getInternalCodAnags().isEmpty()) {
+                            this.sendError(new Exception("Nessuna anagrafica aziendale configurata. Assicurarsi di aver abilitato il flag FLAG_USE_COD_ANAG_AZIENDALE."));
+                            return;
+                        }
+
+                        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 -> {
+                        if (mMtbColtSessionID != null)
+                            this.mColliDataRecoverService.closeSession(mMtbColtSessionID);
+
                         this.sendLUClosed();
                         this.sendOnLoadingEnded();
 
@@ -954,9 +1020,25 @@ public class PickingLiberoViewModel {
         if (this.mListener != null) mListener.onLULineaProdRequired(onComplete, onAbort);
     }
 
-    private void sendArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
+    private void sendLUCommessaRequired(RunnableArgs<JtbComt> onComplete, Runnable onAbort) {
+        if (this.mListener != null) mListener.onLUCommessaRequired(onComplete, onAbort);
+    }
+
+    private List<MtbColr> sendArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart) throws InterruptedException {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        AtomicReference<List<MtbColr>> result = new AtomicReference<>();
+
+
         if (this.mListener != null)
-            mListener.onArtSelectionRequest(mtbColrsToPick, mtbAart, onComplete, onAbort);
+            mListener.onArtSelectionRequest(mtbColrsToPick, mtbAart, mtbColrs -> {
+                result.set(mtbColrs);
+                countDownLatch.countDown();
+            }, countDownLatch::countDown);
+        else countDownLatch.countDown();
+
+
+        countDownLatch.await();
+        return result.get();
     }
 
     private void sendOnItemDispatched(PickingObjectDTO pickingObjectDTO,
@@ -976,6 +1058,7 @@ public class PickingLiberoViewModel {
                                       boolean canPartitaMagBeChanged,
                                       boolean canLUBeClosed,
                                       RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
+
         if (this.mListener != null) mListener.onItemDispatched(pickingObjectDTO,
                 mtbAart,
                 initialNumCnf,
@@ -1012,6 +1095,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/ProdOrdineProduzioneElencoModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoModule.java
index a87fdc14..2c0f5239 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoModule.java
@@ -2,14 +2,15 @@ package it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione;
 
 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.rest.ProdOrdineProduzioneRESTConsumer;
 
 @Module(subcomponents = ProdOrdineProduzioneElencoComponent.class)
 public class ProdOrdineProduzioneElencoModule {
 
     @Provides
-    ProdOrdineProduzioneRESTConsumer providesProdOrdineProduzioneRESTConsumer() {
-        return new ProdOrdineProduzioneRESTConsumer();
+    ProdOrdineProduzioneRESTConsumer providesProdOrdineProduzioneRESTConsumer(RESTBuilder restBuilder) {
+        return new ProdOrdineProduzioneRESTConsumer(restBuilder);
     }
 
     @Provides
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..d0d33a8c 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,30 +11,35 @@ 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
 public class ProdOrdineProduzioneRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
+
+    public ProdOrdineProduzioneRESTConsumer(RESTBuilder restBuilder) {
+        this.restBuilder = restBuilder;
+    }
+
     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<>() {
+        OrdiniAccettazioneRESTConsumerService service = restBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
+        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);
             }
         });
     }
@@ -46,17 +53,16 @@ public class ProdOrdineProduzioneRESTConsumer extends _BaseRESTConsumer {
                         .setNumero(x.getNumero()))
                 .toList();
 
-        OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
-        service.getArticoliFromOrdiniAccettazione(getPickingListDTOs).enqueue(new Callback<>() {
+        OrdiniAccettazioneRESTConsumerService service = restBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
+        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/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..710cd106 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,31 +13,31 @@ 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
 public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
 
-    private final SystemRESTConsumer mSystemRESTConsumer;
+    private final RESTBuilder restBuilder;
+    private final SystemRESTConsumer systemRESTConsumer;
 
-    public ProdFabbisognoLineeProdRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        this.mSystemRESTConsumer = systemRESTConsumer;
+    public ProdFabbisognoLineeProdRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        this.restBuilder = restBuilder;
+        this.systemRESTConsumer = systemRESTConsumer;
     }
 
 
     public void loadFabbisogno(String numOrd, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        ProdFabbisognoLineeProdRESTConsumerService prodFabbisognoLineeProdRESTConsumerService = RESTBuilder.getService(ProdFabbisognoLineeProdRESTConsumerService.class);
+        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 +45,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);
                     }
                 });
     }
@@ -73,7 +75,7 @@ public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
 
 
         Type typeOfObjectsList = new TypeToken<ArrayList<ProdFabbisognoLineeProdDTO>>() {}.getType();
-        this.mSystemRESTConsumer.processSql(sql, typeOfObjectsList, onComplete, onFailed);
+        this.systemRESTConsumer.processSql(sql, typeOfObjectsList, onComplete, onFailed);
     }
 
 }
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..9cded2fd 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,11 @@ package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail;
 
 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+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;
 
@@ -11,16 +14,20 @@ import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.Pro
 public class ProdRientroMerceOrderDetailModule {
 
     @Provides
-    ProdRientroMerceOrderDetailRESTConsumer provideProdRientroMerceOrderDetailRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new ProdRientroMerceOrderDetailRESTConsumer(systemRESTConsumer);
+    ProdRientroMerceOrderDetailRESTConsumer provideProdRientroMerceOrderDetailRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        return new ProdRientroMerceOrderDetailRESTConsumer(restBuilder, systemRESTConsumer);
     }
 
     @Provides
     ProdRientroMerceOrderDetailViewModel provideProdRientroMerceOrderDetailViewModel(
+            RESTBuilder restBuilder,
             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..8a1006df 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().getFullname())
+                        .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..33d9b1cd 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,22 +21,24 @@ 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
 public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
 
+    private final RESTBuilder restBuilder;
     private final SystemRESTConsumer systemRESTConsumer;
 
     @Inject
-    public ProdRientroMerceOrderDetailRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+    public ProdRientroMerceOrderDetailRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        this.restBuilder = restBuilder;
         this.systemRESTConsumer = systemRESTConsumer;
     }
 
@@ -48,7 +51,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 +111,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);
+        ProdRientroMerceOrderDetailRESTConsumerService service = restBuilder.getService(ProdRientroMerceOrderDetailRESTConsumerService.class);
+        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<MtbColt>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
+                    }
                 });
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<List<MtbColt>>> call, Throwable t) {
-                Logger.e(t, "importColliDaProduzione");
-                onFailed.run(new Exception(t));
-            }
-        });
     }
 
 
     public void deleteColloDaProduzione(MtbColt mtbColtToDelete, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ProdRientroMerceOrderDetailRESTConsumerService service = RESTBuilder.getService(ProdRientroMerceOrderDetailRESTConsumerService.class);
-        service.deleteColloDaProduzione(mtbColtToDelete).enqueue(new Callback<ServiceRESTResponse<Object>>() {
+        ProdRientroMerceOrderDetailRESTConsumerService service = restBuilder.getService(ProdRientroMerceOrderDetailRESTConsumerService.class);
+        service.deleteColloDaProduzione(mtbColtToDelete).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                 analyzeAnswer(response, "deleteColloDaProduzione", mtbColt -> {
@@ -143,9 +146,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..ec00ecf6 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;
@@ -253,7 +252,7 @@ public class ProdRiposizionamentoDaProdFragment extends BaseFragment implements
     };
 
     private void choosePosition(RunnableArgs<MtbDepoPosizione> onComplete) {
-        DialogAskPositionOfLUView.makeBase(false, (status, mtbDepoPosizione) -> {
+        DialogAskPositionOfLUView.newInstance(false, (status, mtbDepoPosizione) -> {
 
                     if (status == DialogConsts.Results.ABORT) {
                         popMe();
@@ -261,7 +260,7 @@ public class ProdRiposizionamentoDaProdFragment extends BaseFragment implements
                         onComplete.run(mtbDepoPosizione);
                     }
 
-                }, this::onError)
+                })
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
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..3aefbe32 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());
 
@@ -224,7 +224,7 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
 //    }
 
     private void choosePosition(RunnableArgs<MtbDepoPosizione> onComplete) {
-        DialogAskPositionOfLUView.makeBase(false, (status, mtbDepoPosizione) -> {
+        DialogAskPositionOfLUView.newInstance(false, (status, mtbDepoPosizione) -> {
 
                     if (status == DialogConsts.Results.ABORT) {
                         popMe();
@@ -232,7 +232,7 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
                         onComplete.run(mtbDepoPosizione);
                     }
 
-                }, this::onError)
+                })
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
@@ -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..bd75077e 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
@@ -14,7 +14,7 @@ import java.util.List;
 import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
-import it.integry.integrywmsnative.core.exception.InvalidCodMdepException;
+import it.integry.integrywmsnative.core.exception.InvalidCodMdepLUException;
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
 import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
 import it.integry.integrywmsnative.core.exception.TooManyLUFoundInMonoLUPositionException;
@@ -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 -> {
@@ -116,7 +116,7 @@ public class ProdVersamentoMaterialeViewModel {
 
                     if (codMdepIsValid) {
                         this.onLUOpened(mtbColt);
-                    } else this.sendError(new InvalidCodMdepException());
+                    } else this.sendError(new InvalidCodMdepLUException());
 
                 }, this::sendError);
             } else {
@@ -135,7 +135,7 @@ public class ProdVersamentoMaterialeViewModel {
 
             if (codMdepIsValid) {
                 this.onLUOpened(mtbColt);
-            } else this.sendError(new InvalidCodMdepException());
+            } else this.sendError(new InvalidCodMdepLUException());
 
         }, this::sendError);
     }
@@ -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..89af359c 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)
@@ -95,7 +95,7 @@ public class ProdVersamentoMaterialeInBufferFragment extends BaseFragment implem
 
 
     private void choosePosition() {
-        DialogAskPositionOfLUView.makeBase(true, (status, mtbDepoPosizione) -> {
+        DialogAskPositionOfLUView.newInstance(true, (status, mtbDepoPosizione) -> {
 
                     if (status == DialogConsts.Results.ABORT) {
                         popMe();
@@ -105,7 +105,7 @@ public class ProdVersamentoMaterialeInBufferFragment extends BaseFragment implem
                         });
                     }
 
-                }, this::onError)
+                })
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
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/pv_verifica_giacenze/VerificaGiacenzeComponent.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeComponent.java
new file mode 100644
index 00000000..51c9eecc
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.pv_verifica_giacenze;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface VerificaGiacenzeComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        VerificaGiacenzeComponent create();
+    }
+
+    void inject(VerificaGiacenzeFragment VerificaGiacenzeFragment);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java
new file mode 100644
index 00000000..5b2c6f19
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java
@@ -0,0 +1,349 @@
+package it.integry.integrywmsnative.gest.pv_verifica_giacenze;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.ravikoradiya.liveadapter.LiveAdapter;
+import com.ravikoradiya.liveadapter.Type;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.inject.Inject;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.BR;
+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.data_store.db.entity.VerificaGiacenzeRowEntity;
+import it.integry.integrywmsnative.core.expansion.BaseFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeRowMapper;
+import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.databinding.FragmentVerificaGiacenzeBinding;
+import it.integry.integrywmsnative.databinding.ListaVerificaGiacenzePickedItemListModelBinding;
+import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.view.bottom_sheet__item_edit.BottomSheetItemDTO;
+import it.integry.integrywmsnative.view.bottom_sheet__item_edit.BottomSheetItemEditView;
+import it.integry.integrywmsnative.view.dialogs.DialogConsts;
+import it.integry.integrywmsnative.view.dialogs.ask_deposito.DialogAskDepositoView;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
+import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
+
+public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFragment, VerificaGiacenzeViewModel.Listener, BottomSheetItemEditView.Listener<VerificaGiacenzeRowEntity> {
+
+    @Inject
+    VerificaGiacenzeViewModel mViewModel;
+
+    @Inject
+    DialogInputQuantityV2View dialogInputQuantityV2View;
+
+    @Inject
+    VerificaGiacenzeRowMapper verificaGiacenzeRowMapper;
+
+    private FragmentVerificaGiacenzeBinding mBindings;
+    private int barcodeScannerIstanceID = -1;
+
+
+    public VerificaGiacenzeFragment() {
+        // Required empty public constructor
+    }
+
+    public static VerificaGiacenzeFragment newInstance() {
+        return new VerificaGiacenzeFragment();
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        setRetainInstance(true);
+
+        mBindings = FragmentVerificaGiacenzeBinding.inflate(inflater, container, false);
+        mBindings.setLifecycleOwner(this);
+
+        MainApplication.appComponent
+                .verificaGiacenzeComponent()
+                .create()
+                .inject(this);
+
+        mBindings.setView(this);
+        mBindings.setViewModel(mViewModel);
+
+        mViewModel.setListener(this);
+
+        this.init();
+
+        return mBindings.getRoot();
+    }
+
+    private void init() {
+
+        executorService.execute(() -> {
+
+            boolean recoveredSession = false;
+            String codMdep = null;
+
+            try {
+
+                if (mViewModel.isAnotherVerificaGiacenzeInProgress()) {
+                    boolean recover = askToRecoverPrevious();
+
+                    if (recover) {
+                        // Recover data
+                        var latestVerifica = mViewModel.recoverLast();
+                        codMdep = latestVerifica.getCodMdep();
+                        recoveredSession = true;
+                    } else {
+                        // Start new
+                        mViewModel.clearPreviousSessions();
+                        codMdep = this.askDeposito();
+                    }
+                } else {
+                    //Clear to be sure everything is clean
+                    mViewModel.clearPreviousSessions();
+                    codMdep = this.askDeposito();
+                }
+            } catch (Exception e) {
+                this.onError(e);
+            }
+
+            if (codMdep == null) {
+                popMe();
+                return;
+            }
+
+
+            try {
+                this.onLoadingStarted();
+                mViewModel.loadDeposito(codMdep);
+
+                if (!recoveredSession) mViewModel.createNew(codMdep);
+
+                this.onLoadingEnded();
+            } catch (Exception e) {
+                this.onError(e);
+                popMe();
+            }
+
+            this.initRecyclerView();
+            this.initBarcodeReader();
+
+
+            this.onLoadingStarted();
+            executorService.execute(() -> {
+                mViewModel.randomizeElements(2000);
+                this.onLoadingEnded();
+            });
+        });
+    }
+
+    private boolean askToRecoverPrevious() throws InterruptedException {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        AtomicReference<Boolean> response = new AtomicReference<>();
+
+        DialogYesNoView.newInstance("Recupero verifica", "Vuoi recuperare la verifica precedente?", result -> {
+                    response.set(result == DialogConsts.Results.YES);
+                    countDownLatch.countDown();
+                })
+                .show(getChildFragmentManager(), "ask-recover");
+
+        countDownLatch.await();
+        return response.get();
+    }
+
+    private String askDeposito() throws InterruptedException {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        AtomicReference<String> codMdepAtomic = new AtomicReference<>();
+
+
+        DialogAskDepositoView.newInstance(codMdep -> {
+                    codMdepAtomic.set(codMdep);
+                    countDownLatch.countDown();
+                })
+                .show(getChildFragmentManager(), "ask-deposito");
+
+        countDownLatch.await();
+        return codMdepAtomic.get();
+    }
+
+
+    private void initRecyclerView() {
+        var itemType = new Type<VerificaGiacenzeRowEntity, ListaVerificaGiacenzePickedItemListModelBinding>(R.layout.lista_verifica_giacenze_picked_item_list_model, BR.item);
+
+        itemType.areItemSame((item1, item2) -> item1.getId().equals(item2.getId()));
+        itemType.areContentsTheSame(VerificaGiacenzeRowEntity::equals);
+        itemType.onClick(x -> {
+            openItemAction(x.getBinding().getItem());
+            return null;
+        });
+
+        handler.post(() -> {
+            new LiveAdapter(mViewModel.getCurrentVerificaRows(), this)
+                    .map(VerificaGiacenzeRowEntity.class, itemType)
+                    .onNoData(isNoData -> {
+                        this.mBindings.verificaGiacenzeList.setVisibility(isNoData ? View.GONE : View.VISIBLE);
+                        this.mBindings.emptyView.setVisibility(isNoData ? View.VISIBLE : View.GONE);
+
+                        return null;
+                    })
+                    .into(this.mBindings.verificaGiacenzeList);
+        });
+    }
+
+    private void initBarcodeReader() {
+        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessful(onScanSuccessful)
+                .setOnScanFailed(ex -> UtilityExceptions.defaultException(requireContext(), ex, false)));
+    }
+
+    private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
+        this.onLoadingStarted();
+
+        executorService.execute(() -> {
+            try {
+                this.mViewModel.processBarcodeDTO(data);
+                this.onLoadingEnded();
+            } catch (Exception e) {
+                this.onError(e);
+            }
+        });
+
+    };
+
+
+    private void openItemAction(VerificaGiacenzeRowEntity item) {
+        var anagrafica = mViewModel.searchAnagraficaByCodMart(item.getCodMart());
+
+        var inputData = new BottomSheetItemDTO<VerificaGiacenzeRowEntity>()
+                .setOriginalItem(item)
+                .setCodMart(item.getCodMart())
+                .setPartitaMag(item.getPartitaMag())
+                .setDescrizione(item.getDescrizione())
+                .setQta(item.getQta())
+                .setNumCnf(item.getNumConf())
+                .setUntMis(anagrafica.getUntMis());
+
+        new BottomSheetItemEditView(inputData)
+                .setListener(this)
+                .show(getParentFragmentManager(), "bottom-item-actions");
+    }
+
+    @Override
+    public void onItemEditRequest(VerificaGiacenzeRowEntity item) {
+        var anagrafica = mViewModel.searchAnagraficaByCodMart(item.getCodMart());
+
+        executorService.execute(() -> {
+            try {
+                mViewModel.loadArticolo(anagrafica);
+            } catch (Exception ex) {
+                onError(ex);
+            }
+        });
+    }
+
+    @Override
+    public void onItemDeleteRequest(VerificaGiacenzeRowEntity data) {
+        mViewModel.deleteRow(data);
+    }
+
+
+    public PickedQuantityDTO onItemDispatched(MtbAart mtbAart,
+                                              BigDecimal initialNumCnf,
+                                              BigDecimal initialQtaCnf,
+                                              BigDecimal initialQtaTot,
+                                              BigDecimal inWarehouseNumCnf,
+                                              BigDecimal inWarehouseQtaTot,
+                                              BigDecimal incomingNumCnf,
+                                              BigDecimal incomingQtaTot,
+                                              String partitaMag,
+                                              LocalDate dataScad) {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        AtomicReference<PickedQuantityDTO> result = new AtomicReference<>();
+
+        DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
+                .setMtbAart(mtbAart)
+                .setInitialNumCnf(initialNumCnf)
+                .setInitialQtaCnf(initialQtaCnf)
+                .setInitialQtaTot(initialQtaTot)
+                .setTotalNumCnfInWarehouse(inWarehouseNumCnf)
+                .setTotalQtaInWarehouse(inWarehouseQtaTot)
+                .setTotalQtaOrd(incomingQtaTot)
+                .setTotalNumCnfOrd(incomingNumCnf)
+                .setPartitaMag(partitaMag)
+                .setDataScad(dataScad)
+                .setCanLUBeClosed(false);
+
+        if (!dialogInputQuantityV2View.isVisible())
+            handler.post(() -> {
+                dialogInputQuantityV2View
+                        .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                        .setOnComplete((resultDTO, shouldCloseLU) -> {
+
+                            PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
+                                    .setNumCnf(resultDTO.getNumCnf())
+                                    .setQtaCnf(resultDTO.getQtaCnf())
+                                    .setQtaTot(resultDTO.getQtaTot())
+                                    .setPartitaMag(resultDTO.getPartitaMag())
+                                    .setDataScad(resultDTO.getDataScad());
+
+                            result.set(pickedQuantityDTO);
+                            countDownLatch.countDown();
+
+                        })
+                        .setOnAbort(() -> {
+                            result.set(null);
+                            countDownLatch.countDown();
+                        })
+                        .show(requireActivity().getSupportFragmentManager(), "tag");
+            });
+
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            this.onError(e);
+        }
+        return result.get();
+    }
+
+    public void saveAndClose() {
+        this.onLoadingStarted();
+
+        executorService.execute(() -> {
+            try {
+                mViewModel.save();
+                this.onLoadingEnded();
+
+                popMe();
+            } catch (Exception e) {
+                this.onError(e);
+            }
+        });
+    }
+
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        BarcodeManager.removeCallback(barcodeScannerIstanceID);
+    }
+
+    @Override
+    public void onCreateActionBar(AppCompatTextView titleText, Context context) {
+        titleText.setText(R.string.verifica_giacenze_menu);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeModule.java
new file mode 100644
index 00000000..72d23a34
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeModule.java
@@ -0,0 +1,23 @@
+package it.integry.integrywmsnative.gest.pv_verifica_giacenze;
+
+import android.os.Handler;
+
+import java.util.concurrent.ExecutorService;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRepository;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRowRepository;
+import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeMapper;
+import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
+
+@Module(subcomponents = VerificaGiacenzeComponent.class)
+public class VerificaGiacenzeModule {
+
+    @Provides
+    VerificaGiacenzeViewModel providesVerificaGiacenzeViewModel(ExecutorService executorService, Handler handler, VerificaGiacenzeMapper verificaGiacenzeMapper, VerificaGiacenzeRepository verificaGiacenzeRepository, VerificaGiacenzeRowRepository verificaGiacenzeRowRepository, GiacenzaPvRESTConsumer giacenzaPvRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+        return new VerificaGiacenzeViewModel(executorService, handler, verificaGiacenzeMapper, giacenzaPvRESTConsumer, verificaGiacenzeRepository, verificaGiacenzeRowRepository, articoloRESTConsumer);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeViewModel.java
new file mode 100644
index 00000000..7433c52b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeViewModel.java
@@ -0,0 +1,377 @@
+package it.integry.integrywmsnative.gest.pv_verifica_giacenze;
+
+import android.os.Handler;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeEntity;
+import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeRowEntity;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRepository;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRowRepository;
+import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
+import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeMapper;
+import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
+import it.integry.integrywmsnative.core.rest.model.pv.GiacenzaPvDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.SaveNewVerificaRequestDTO;
+import it.integry.integrywmsnative.core.utility.UtilityBarcode;
+import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
+import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+
+public class VerificaGiacenzeViewModel {
+
+    private final ExecutorService executorService;
+    private final Handler handler;
+    private final VerificaGiacenzeMapper verificaGiacenzeMapper;
+    private final GiacenzaPvRESTConsumer giacenzaPvRESTConsumer;
+    private final VerificaGiacenzeRepository verificaGiacenzeRepository;
+    private final VerificaGiacenzeRowRepository verificaGiacenzeRowRepository;
+    private final ArticoloRESTConsumer articoloRESTConsumer;
+
+    private Listener listener;
+
+    private MutableLiveData<VerificaGiacenzeEntity> currentVerifica = new MutableLiveData<>();
+    private final MutableLiveData<List<VerificaGiacenzeRowEntity>> currentVerificaRows = new MutableLiveData<>(new ArrayList<>());
+
+    private List<GiacenzaPvDTO> currentLoadedGiacenza = null;
+    private List<MtbAart> currentLoadedAnagrafiche = null;
+
+    @Inject
+    public VerificaGiacenzeViewModel(ExecutorService executorService,
+                                     Handler handler,
+                                     VerificaGiacenzeMapper verificaGiacenzeMapper,
+                                     GiacenzaPvRESTConsumer giacenzaPvRESTConsumer,
+                                     VerificaGiacenzeRepository verificaGiacenzeRepository,
+                                     VerificaGiacenzeRowRepository verificaGiacenzeRowRepository,
+                                     ArticoloRESTConsumer articoloRESTConsumer) {
+        this.executorService = executorService;
+        this.handler = handler;
+        this.verificaGiacenzeMapper = verificaGiacenzeMapper;
+        this.giacenzaPvRESTConsumer = giacenzaPvRESTConsumer;
+        this.verificaGiacenzeRepository = verificaGiacenzeRepository;
+        this.verificaGiacenzeRowRepository = verificaGiacenzeRowRepository;
+        this.articoloRESTConsumer = articoloRESTConsumer;
+    }
+
+    public boolean isAnotherVerificaGiacenzeInProgress() {
+        return verificaGiacenzeRepository.isAnotherVerificaGiacenzeInProgress(5);
+    }
+
+    public void clearPreviousSessions() {
+        verificaGiacenzeRepository.clearPreviousSessions();
+    }
+
+    public void delete() {
+        verificaGiacenzeRepository.delete(currentVerifica.getValue());
+
+        currentVerifica.postValue(null);
+        currentVerificaRows.postValue(new ArrayList<>());
+
+        currentLoadedGiacenza = null;
+        currentLoadedAnagrafiche = null;
+    }
+
+    public LiveData<VerificaGiacenzeEntity> getCurrentVerifica() {
+        return currentVerifica;
+    }
+
+    public LiveData<List<VerificaGiacenzeRowEntity>> getCurrentVerificaRows() {
+        return currentVerificaRows;
+    }
+
+    public void loadDeposito(String codMdep) throws Exception {
+        currentLoadedGiacenza = this.giacenzaPvRESTConsumer.retrieveGiacenzeSynchronized(codMdep);
+
+        if (currentLoadedGiacenza == null) {
+            throw new Exception("Errore nel recupero delle giacenze");
+        }
+
+        var codMartsToRetrieve = currentLoadedGiacenza.parallelStream()
+                .map(GiacenzaPvDTO::getCodMart)
+                .collect(Collectors.toUnmodifiableList());
+
+        currentLoadedAnagrafiche = this.articoloRESTConsumer.getByCodMartsSynchronized(codMartsToRetrieve);
+
+        if (currentLoadedAnagrafiche == null) {
+            throw new Exception("Errore nel recupero delle anagrafiche");
+        }
+
+        currentLoadedAnagrafiche.forEach(x -> x.setFlagTracciabilita("N"));
+    }
+
+    public void randomizeElements(int elementsCount) {
+
+        for(int i = 0; i < elementsCount; i++) {
+            var randomIndex = (int) (Math.random() * currentLoadedAnagrafiche.size());
+            var randomAnagrafica = currentLoadedAnagrafiche.get(randomIndex);
+
+            var foundGiacenza = currentLoadedGiacenza.parallelStream()
+                    .filter(x -> x.getCodMart().equalsIgnoreCase(randomAnagrafica.getCodMart()))
+                    .findFirst()
+                    .orElse(null);
+            var qtaGiacenza = foundGiacenza != null ? foundGiacenza.getQtaInv() : BigDecimal.ZERO;
+
+            var rowToInsert = new VerificaGiacenzeRowEntity();
+            rowToInsert.setParentId(currentVerifica.getValue().getId());
+            rowToInsert.setCodMart(randomAnagrafica.getCodMart());
+            rowToInsert.setDescrizione(randomAnagrafica.getDescrizione());
+            rowToInsert.setScanCodBarre(randomAnagrafica.getBarCode());
+            rowToInsert.setNumConf(BigDecimal.valueOf((int) (Math.random() * 100)));
+            rowToInsert.setQtaConf(randomAnagrafica.getQtaCnf());
+            rowToInsert.setQta(UtilityBigDecimal.multiply(rowToInsert.getNumConf(), randomAnagrafica.getQtaCnf()));
+            rowToInsert.setQtaInGiacenza(qtaGiacenza);
+
+
+            insertRow(rowToInsert);
+
+            try {
+                Thread.sleep(50);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+    }
+
+    public void createNew(String codMdep) {
+        var verificaGiacenzeEntity = new VerificaGiacenzeEntity();
+        verificaGiacenzeEntity.setCodMdep(codMdep);
+        verificaGiacenzeEntity.setData(LocalDateTime.now());
+        verificaGiacenzeEntity.setVerificaGiacenzeRowList(new ArrayList<>());
+
+        verificaGiacenzeRepository.insert(verificaGiacenzeEntity);
+        currentVerifica.postValue(verificaGiacenzeEntity);
+    }
+
+    public VerificaGiacenzeEntity recoverLast() {
+        var entity = verificaGiacenzeRepository.retrieveLast();
+        currentVerifica.postValue(entity);
+        currentVerificaRows.postValue(entity.getVerificaGiacenzeRowList());
+
+        return entity;
+    }
+
+
+    public void save() throws Exception {
+        if(currentVerificaRows.getValue().isEmpty()) {
+            delete();
+            return;
+        }
+
+        currentVerifica.getValue().setVerificaGiacenzeRowList(currentVerificaRows.getValue());
+
+        SaveNewVerificaRequestDTO saveRequest = new SaveNewVerificaRequestDTO()
+                .setData(verificaGiacenzeMapper.mapRoomToRest(currentVerifica.getValue()));
+
+        giacenzaPvRESTConsumer.saveNewVerificaSynchronized(saveRequest);
+
+        delete();
+    }
+
+    public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) throws Exception {
+
+        if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
+            var ean13 = Ean13PesoModel.fromBarcode(barcodeScanDTO.getStringValue());
+            this.loadArticolo(ean13.getPrecode());
+
+        } else {
+            this.loadArticolo(barcodeScanDTO.getStringValue());
+        }
+    }
+
+
+    private void loadArticolo(String barcodeProd) throws NoArtsFoundException, CloneNotSupportedException {
+        var foundMtbAart = searchAnagraficaByBarcode(barcodeProd);
+
+        if (foundMtbAart == null)
+            throw new NoArtsFoundException();
+
+        loadArticolo(foundMtbAart);
+    }
+
+    public void loadArticolo(MtbAart mtbAart) throws NoArtsFoundException, CloneNotSupportedException {
+        var foundGiacenza = currentLoadedGiacenza.parallelStream()
+                .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()))
+                .findFirst()
+                .orElse(null);
+
+        var numCnfGiacenza = foundGiacenza != null ? UtilityBigDecimal.divide(foundGiacenza.getQtaInv(), mtbAart.getQtaCnf()) : BigDecimal.ZERO;
+        var qtaCnfGiacenza = mtbAart.getQtaCnf();
+        var qtaGiacenza = foundGiacenza != null ? foundGiacenza.getQtaInv() : BigDecimal.ZERO;
+
+
+        var incomingNumCnf = foundGiacenza != null && foundGiacenza.getIncomingStock() != null ? UtilityBigDecimal.divide(foundGiacenza.getIncomingStock(), mtbAart.getQtaCnf()) : null;
+        var incomingQta = foundGiacenza != null && foundGiacenza.getIncomingStock() != null ? foundGiacenza.getIncomingStock() : null;
+
+        var initialNumCnf = BigDecimal.ZERO;
+        var initialQtaTot = BigDecimal.ZERO;
+
+        boolean isNewRow = false;
+
+        var rowToSave = currentVerificaRows.getValue().parallelStream()
+                .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()))
+                .findFirst()
+                .orElse(null);
+
+        if (rowToSave == null) {
+            isNewRow = true;
+
+            rowToSave = new VerificaGiacenzeRowEntity();
+            rowToSave.setParentId(currentVerifica.getValue().getId());
+            rowToSave.setCodMart(mtbAart.getCodMart());
+            rowToSave.setPartitaMag(null);
+            rowToSave.setDescrizione(mtbAart.getDescrizione());
+            rowToSave.setScanCodBarre(mtbAart.getBarCode());
+        } else {
+            rowToSave = rowToSave.clone();
+            initialNumCnf = rowToSave.getNumConf();
+            initialQtaTot = rowToSave.getQta();
+        }
+
+        var pickedQuantity = this.sendOnItemDispatched(mtbAart,
+                initialNumCnf,
+                qtaCnfGiacenza,
+                initialQtaTot,
+                numCnfGiacenza,
+                qtaGiacenza,
+                incomingNumCnf,
+                incomingQta,
+                null,
+                null
+        );
+
+        if (pickedQuantity == null)
+            return;
+
+
+        rowToSave.setNumConf(pickedQuantity.getNumCnf());
+        rowToSave.setQtaConf(pickedQuantity.getQtaCnf());
+        rowToSave.setQta(pickedQuantity.getQtaTot());
+        rowToSave.setQtaInGiacenza(qtaGiacenza);
+
+        if (isNewRow) {
+            insertRow(rowToSave);
+        } else {
+            updateRow(rowToSave);
+        }
+
+    }
+
+    public MtbAart searchAnagraficaByCodMart(String codMart) {
+        return currentLoadedAnagrafiche.parallelStream()
+                .filter(mtbAart -> codMart.equalsIgnoreCase(mtbAart.getCodMart()))
+                .findFirst()
+                .orElse(null);
+    }
+
+    public MtbAart searchAnagraficaByBarcode(String barcode) {
+        return currentLoadedAnagrafiche.parallelStream()
+                .filter(mtbAart -> barcode.equals(mtbAart.getBarCode()))
+                .findFirst()
+                .orElse(null);
+    }
+
+    public void insertRow(VerificaGiacenzeRowEntity rowEntity) {
+        verificaGiacenzeRowRepository.insert(rowEntity, insertedData -> {
+            handler.post(() -> {
+                currentVerificaRows.getValue().add(insertedData);
+                notifyRowChanged();
+            });
+        }, this::sendError);
+    }
+
+    public void updateRow(VerificaGiacenzeRowEntity rowEntity) {
+        var indexInList = -1;
+
+        List<VerificaGiacenzeRowEntity> value = currentVerificaRows.getValue();
+        for (int i = 0; i < value.size(); i++) {
+            VerificaGiacenzeRowEntity entity = value.get(i);
+
+            if (Objects.equals(entity.getId(), rowEntity.getId())) {
+                indexInList = i;
+                break;
+            }
+        }
+
+        int finalIndexInList = indexInList;
+        verificaGiacenzeRowRepository.update(rowEntity, updatedData -> {
+            handler.post(() -> {
+                currentVerificaRows.getValue().set(finalIndexInList, updatedData);
+                notifyRowChanged();
+            });
+        }, this::sendError);
+    }
+
+    public void deleteRow(VerificaGiacenzeRowEntity rowEntity) {
+        verificaGiacenzeRowRepository.delete(rowEntity, () -> {
+
+            handler.post(() -> {
+                currentVerificaRows.getValue().remove(rowEntity);
+                notifyRowChanged();
+            });
+
+        }, this::sendError);
+    }
+
+    private void notifyRowChanged() {
+        currentVerificaRows.postValue(currentVerificaRows.getValue());
+    }
+
+    private PickedQuantityDTO sendOnItemDispatched(MtbAart mtbAart,
+                                                   BigDecimal initialNumCnf,
+                                                   BigDecimal initialQtaCnf,
+                                                   BigDecimal initialQtaTot,
+                                                   BigDecimal inWarehouseNumCnf,
+                                                   BigDecimal inWarehouseQtaTot,
+                                                   BigDecimal incomingNumCnf,
+                                                   BigDecimal incomingQtaTot,
+                                                   String partitaMag,
+                                                   LocalDate dataScad) {
+        if (listener != null)
+            return this.listener.onItemDispatched(mtbAart,
+                    initialNumCnf, initialQtaCnf, initialQtaTot,
+                    inWarehouseNumCnf, inWarehouseQtaTot,
+                    incomingNumCnf, incomingQtaTot,
+                    partitaMag, dataScad);
+        return null;
+    }
+
+    public void setListener(Listener listener) {
+        this.listener = listener;
+    }
+
+    private void sendError(Exception ex) {
+        if (listener != null)
+            this.listener.onError(ex);
+    }
+
+    public interface Listener {
+        PickedQuantityDTO onItemDispatched(MtbAart mtbAart,
+                                           BigDecimal initialNumCnf,
+                                           BigDecimal initialQtaCnf,
+                                           BigDecimal initialQtaTot,
+                                           BigDecimal inWarehouseNumCnf,
+                                           BigDecimal inWarehouseQtaTot,
+                                           BigDecimal incomingNumCnf,
+                                           BigDecimal incomingQtaTot,
+                                           String partitaMag,
+                                           LocalDate dataScad);
+
+        void onError(Exception ex);
+    }
+}
\ No newline at end of file
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..b559bdf1 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;
@@ -268,46 +268,49 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
     @Override
     public void onFornitoriLoaded(ArrayList<FornitoreDTO> fornitoriList) {
-        AutoCompleteFornitoreAdapter autoCompleteFornitoreAdapter = new AutoCompleteFornitoreAdapter(getActivity(), fornitoriList);
-        mBinding.autoCompleteFornitori.setAdapter(autoCompleteFornitoreAdapter);
-        mBinding.autoCompleteFornitori.setDropDownWidth(getActivity().getResources().getDisplayMetrics().widthPixels);
+        handler.post(() -> {
 
-        mBinding.inputCodArtDescrForn.setOnEditorActionListener((v, actionId, event) -> {
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                resetAllError();
+            AutoCompleteFornitoreAdapter autoCompleteFornitoreAdapter = new AutoCompleteFornitoreAdapter(getActivity(), fornitoriList);
+            mBinding.autoCompleteFornitori.setAdapter(autoCompleteFornitoreAdapter);
+            mBinding.autoCompleteFornitori.setDropDownWidth(getActivity().getResources().getDisplayMetrics().widthPixels);
 
-                if (UtilityString.isNullOrEmpty(mBinding.autoCompleteFornitori.getText().toString())) {
-                    setError(mBinding.autoCompleteFornitoriLayout, getActivity().getResources().getText(R.string.error).toString());
+            mBinding.inputCodArtDescrForn.setOnEditorActionListener((v, actionId, event) -> {
+                if (actionId == EditorInfo.IME_ACTION_DONE) {
+                    resetAllError();
+
+                    if (UtilityString.isNullOrEmpty(mBinding.autoCompleteFornitori.getText().toString())) {
+                        setError(mBinding.autoCompleteFornitoriLayout, getActivity().getResources().getText(R.string.error).toString());
+                        return true;
+                    }
+
+                    if (UtilityString.isNullOrEmpty(mBinding.inputCodArtDescrForn.getText().toString())) {
+                        setError(mBinding.layoutCodArtDescrForn, getActivity().getResources().getText(R.string.error).toString());
+                        return true;
+                    }
+
+                    mViewModel.searchArtFor(
+                            mBinding.autoCompleteFornitori.getText().toString(),
+                            mBinding.inputCodArtDescrForn.getText().toString());
                     return true;
                 }
+                return false;
+            });
 
-                if (UtilityString.isNullOrEmpty(mBinding.inputCodArtDescrForn.getText().toString())) {
-                    setError(mBinding.layoutCodArtDescrForn, getActivity().getResources().getText(R.string.error).toString());
+
+            mBinding.inputCodArtDescrInt.setOnEditorActionListener((v, actionId, event) -> {
+                if (actionId == EditorInfo.IME_ACTION_DONE) {
+                    resetAllError();
+
+                    if (UtilityString.isNullOrEmpty(mBinding.inputCodArtDescrInt.getText().toString())) {
+                        setError(mBinding.layoutCodArtDescrInt, getActivity().getResources().getText(R.string.error).toString());
+                        return true;
+                    }
+
+                    mViewModel.searchArtInt(mBinding.inputCodArtDescrInt.getText().toString(), null, null);
                     return true;
                 }
-
-                mViewModel.searchArtFor(
-                        mBinding.autoCompleteFornitori.getText().toString(),
-                        mBinding.inputCodArtDescrForn.getText().toString());
-                return true;
-            }
-            return false;
-        });
-
-
-        mBinding.inputCodArtDescrInt.setOnEditorActionListener((v, actionId, event) -> {
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                resetAllError();
-
-                if (UtilityString.isNullOrEmpty(mBinding.inputCodArtDescrInt.getText().toString())) {
-                    setError(mBinding.layoutCodArtDescrInt, getActivity().getResources().getText(R.string.error).toString());
-                    return true;
-                }
-
-                mViewModel.searchArtInt(mBinding.inputCodArtDescrInt.getText().toString(), null, null);
-                return true;
-            }
-            return false;
+                return false;
+            });
         });
     }
 
@@ -339,21 +342,25 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
     @Override
     public void onLUOpened(MtbColt mtbColt) {
-        initAdapter();
+        handler.post(() -> {
+            initAdapter();
 
-        this.currentMtbColtObs.set(mtbColt);
-        thereIsAnOpenedUL.set(true);
+            this.currentMtbColtObs.set(mtbColt);
+            thereIsAnOpenedUL.set(true);
+        });
     }
 
     @Override
     public void onLUClosed() {
-        destroyAdapter();
+        handler.post(() -> {
+            destroyAdapter();
 
-        this.currentMtbColtObs.set(null);
-        thereIsAnOpenedUL.set(false);
+            this.currentMtbColtObs.set(null);
+            thereIsAnOpenedUL.set(false);
 
-        this.mViewModel.requestLU();
-        /*if (getActivity() != null) ((IPoppableActivity) getActivity()).pop();*/
+            this.mViewModel.requestLU();
+            /*if (getActivity() != null) ((IPoppableActivity) getActivity()).pop();*/
+        });
     }
 
     @Override
@@ -455,7 +462,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();
     }
 
 
@@ -527,7 +536,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
         DialogYesNoView.newInstance(null, "Vuoi cambiare la posizione della UL corrente?", result -> {
             switch (result) {
                 case YES:
-                    DialogAskPositionOfLUView.makeBase(false, (status, mtbDepoPosizione) -> {
+                    DialogAskPositionOfLUView.newInstance(false, (status, mtbDepoPosizione) -> {
                                 if (status == DialogConsts.Results.ABORT) {
                                     onComplete.run(false, null);
                                 } else {
@@ -537,7 +546,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                                         onComplete.run(true, null);
                                     }
                                 }
-                            }, this::onError)
+                            })
                             .show(requireActivity().getSupportFragmentManager(), "tag");
                     break;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeModule.java
index f20b3373..d82edd5f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeModule.java
@@ -4,6 +4,7 @@ import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
@@ -17,8 +18,8 @@ public class RettificaGiacenzeModule {
 
     @Provides
     @Singleton
-    RettificaGiacenzeRESTConsumer providesRettificaGiacenzeRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new RettificaGiacenzeRESTConsumer(systemRESTConsumer);
+    RettificaGiacenzeRESTConsumer providesRettificaGiacenzeRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
+        return new RettificaGiacenzeRESTConsumer(restBuilder, systemRESTConsumer);
     }
 
 
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..9bc42fcc 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,16 +27,17 @@ 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
 public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
 
-    private final SystemRESTConsumer mSystemRestConsumer;
+    private final RESTBuilder restBuilder;
+    private final SystemRESTConsumer systemRestConsumer;
 
-    public RettificaGiacenzeRESTConsumer(SystemRESTConsumer systemRestConsumer) {
-        mSystemRestConsumer = systemRestConsumer;
+    public RettificaGiacenzeRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRestConsumer) {
+        this.restBuilder = restBuilder;
+        this.systemRestConsumer = systemRestConsumer;
     }
 
     public void loadListaFornitori(RunnableArgs<ArrayList<FornitoreDTO>> onComplete, RunnableArgs<Exception> onFailed) {
@@ -42,18 +46,18 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
         Type typeOfObjectsList = new TypeToken<ArrayList<FornitoreDTO>>() {
         }.getType();
 
-        mSystemRestConsumer.<ArrayList<FornitoreDTO>>processSql(sql, typeOfObjectsList, value -> {
+        systemRestConsumer.<ArrayList<FornitoreDTO>>processSql(sql, typeOfObjectsList, value -> {
             if (onComplete != null) onComplete.run(value);
         }, onFailed);
     }
 
 
     public void searchArtForn(String codAlis, String codArtForOrDescr, RunnableArgs<List<SearchArticoloByCodArtFornOrDescrizioneResponseDTO>> onComplete, RunnableArgs<Exception> onError) {
-        final RettificaGiacenzeRESTConsumerService service = RESTBuilder.getService(RettificaGiacenzeRESTConsumerService.class);
+        final RettificaGiacenzeRESTConsumerService service = restBuilder.getService(RettificaGiacenzeRESTConsumerService.class);
         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 +65,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);
                     }
                 });
 
@@ -72,10 +76,10 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
 
 
     public void searchArtInt(String codMartOrBarcodeOrDescr, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onError) {
-        final RettificaGiacenzeRESTConsumerService service = RESTBuilder.getService(RettificaGiacenzeRESTConsumerService.class);
+        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 +100,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);
                     }
                 });
     }
@@ -108,17 +112,17 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
         var request = new SaveDocFromPickingRequestDTO()
                 .setColliFromMtbColts(Collections.singletonList(mtbColt));
 
-        final RettificaGiacenzeRESTConsumerService service = RESTBuilder.getService(RettificaGiacenzeRESTConsumerService.class);
+        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/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
index e10e28c8..09cb77c2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
@@ -3,8 +3,8 @@ package it.integry.integrywmsnative.gest.settings;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.Bundle;
-import android.text.Html;
-import android.text.SpannableString;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Base64;
 import android.widget.Toast;
 
@@ -18,6 +18,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.sqlite.db.SimpleSQLiteQuery;
 
 import com.annimon.stream.Stream;
+import com.google.android.material.snackbar.Snackbar;
 import com.harrysoft.androidbluetoothserial.BluetoothManager;
 
 import java.io.BufferedReader;
@@ -31,6 +32,7 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -44,10 +46,11 @@ import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.MailAttachmentDTO;
 import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
+import it.integry.integrywmsnative.core.update.UpdatesManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
+import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
 
 public class MainSettingsFragment extends PreferenceFragmentCompat implements ITitledFragment, Preference.OnPreferenceChangeListener {
@@ -67,6 +70,9 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
     @Inject
     public ExecutorService executorService;
 
+    @Inject
+    public UpdatesManager updatesManager;
+
 
     private boolean progressOpened;
 
@@ -75,6 +81,8 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
     public static final String KEY_PALLET_BT_DEVICE = "pallet_scale_bt_device";
     public static final String KEY_TRIGGER_SCAN_MODE = "TRIG_SCAN_MODE";
     public static final String KEY_TRIGGER_SCAN_DELAY = "TRIG_SCAN_DELAY";
+    public static final String KEY_BUTTON_ENABLE_BETA = "ENABLE_BETA";
+    public static final String KEY_BUTTON_CHECK_UPDATES = "CHECK_UPDATES";
     public static final String KEY_BUTTON_EXPORT_LOG = "EXPORT_LOG";
 
     private Collection<BluetoothDevice> btPairedDevices;
@@ -113,8 +121,14 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
         triggerScanModeListPref.setOnPreferenceChangeListener(this);
         triggerScanModeListPref.setSummary(triggerScanModeListPref.getValue());
 
-        Preference button = findPreference(KEY_BUTTON_EXPORT_LOG);
-        button.setOnPreferenceClickListener(preference -> {
+        Preference checkUpdatesButton = findPreference(KEY_BUTTON_CHECK_UPDATES);
+        checkUpdatesButton.setOnPreferenceClickListener(preference -> {
+            checkUpdates();
+            return true;
+        });
+
+        Preference exportLogButton = findPreference(KEY_BUTTON_EXPORT_LOG);
+        exportLogButton.setOnPreferenceClickListener(preference -> {
             exportLog();
             return true;
         });
@@ -126,8 +140,12 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
         var triggerScanModeListPref = (ListPreference) findPreference(KEY_TRIGGER_SCAN_MODE);
         if (triggerScanModeListPref != null) {
             var scanModes = BarcodeSetting.getTriggerScanModes();
-            triggerScanModeListPref.setEntries(scanModes);
-            triggerScanModeListPref.setEntryValues(scanModes);
+
+            var values = scanModes.keySet().toArray(new String[0]);
+            var descriptions = scanModes.values().toArray(new CharSequence[0]);
+
+            triggerScanModeListPref.setEntries(descriptions);
+            triggerScanModeListPref.setEntryValues(values);
             triggerScanModeListPref.setOnPreferenceChangeListener(this);
         }
     }
@@ -150,15 +168,15 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
         if (!btPairedDevices.isEmpty()) {
             CharSequence[] entries = new CharSequence[btPairedDevices.size()];
-            Stream.of(btPairedDevices)
+            btPairedDevices.stream()
                     .map(BluetoothDevice::getName)
-                    .toList()
+                    .collect(Collectors.toList())
                     .toArray(entries);
 
             CharSequence[] entryValues = new CharSequence[btPairedDevices.size()];
-            Stream.of(btPairedDevices)
+            btPairedDevices.stream()
                     .map(BluetoothDevice::getAddress)
-                    .toList()
+                    .collect(Collectors.toList())
                     .toArray(entryValues);
 
             lp.setEntries(entries);
@@ -228,9 +246,20 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
         listPref.setSummary(btDeviceName);
     }
 
+    private void checkUpdates() {
+        Snackbar.make(getView(), R.string.checking_updates, Snackbar.LENGTH_SHORT)
+                .show();
+        updatesManager.executeCheck(getContext(), true);
+    }
+
 
     private void exportLog() {
+        var handler = new Handler(Looper.getMainLooper());
+
         DialogYesNoView.newInstance("Esportazione log", "Vuoi inviare il log degli eventi al supporto?", result -> {
+                    if (result == DialogConsts.Results.NO || result == DialogConsts.Results.ABORT)
+                        return;
+
                     this.openProgress();
 
                     executorService.execute(() -> {
@@ -246,7 +275,7 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
                         try {
                             List<MailAttachmentDTO> attachmentDTOList = new ArrayList<>();
 
-                            if(fileToShare != null) {
+                            if (fileToShare != null) {
                                 var htmlContent = createAppLogAttachment(fileToShare);
 
                                 byte[] buffer = htmlContent.getBytes();//specify the size to allow.
@@ -265,7 +294,7 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
                             dbFiles[1] = requireContext().getDatabasePath("integry_wms-shm");
                             dbFiles[2] = requireContext().getDatabasePath("integry_wms-wal");
 
-                            for(int i = 0; i < dbFiles.length; i++){
+                            for (int i = 0; i < dbFiles.length; i++) {
                                 byte[] dbFileBytes = new byte[(int) dbFiles[i].length()];
                                 FileInputStream inputStream = new FileInputStream(dbFiles[i]);
                                 final int read = inputStream.read(dbFileBytes);
@@ -284,25 +313,14 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
                                     .setAttachments(attachmentDTOList);
 
 
-                            systemRESTConsumer.sendMail(mailRequest, this::closeProgress, ex -> {
-                                this.closeProgress();
-                                requireActivity().runOnUiThread(() -> {
-                                    DialogSimpleMessageView
-                                            .makeErrorDialog(new SpannableString(Html.fromHtml(ex.getMessage())), null, null)
-                                            .show(requireActivity().getSupportFragmentManager(), "tag");
-                                });
-                            });
-                        } catch (Exception ex) {
-                            UtilityExceptions.defaultException(requireContext(), ex);
-                            this.closeProgress();
+                            systemRESTConsumer.sendMailSynchronized(mailRequest);
 
-//                            requireActivity().runOnUiThread(() -> {
-//                                DialogSimpleMessageView
-//                                        .makeErrorDialog(new SpannableString(Html.fromHtml(ex.getMessage())), null, null)
-//                                        .show(requireActivity().getSupportFragmentManager(), "tag");
-//                            });
-//
-//                            FirebaseCrashlytics.getInstance().recordException(ex);
+                            this.closeProgress();
+                        } catch (Exception ex) {
+                            handler.post(() -> {
+                                this.closeProgress();
+                                UtilityExceptions.defaultException(requireContext(), ex);
+                            });
                         }
                     });
                 })
@@ -310,16 +328,15 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
     }
 
 
-
     private void openProgress() {
 //        executorService.execute(() -> {
-            this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
+        this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
 //        });
     }
 
     private void closeProgress() {
 //        executorService.execute(() -> {
-            mCurrentProgress.dismiss();
+        mCurrentProgress.dismiss();
 //        });
     }
 
@@ -334,7 +351,7 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
             while ((line = br.readLine()) != null) {
 
-                if(!line.matches("\\d{13}.*")) {
+                if (!line.matches("\\d{13}.*")) {
                     int lastNewLineChar = text.lastIndexOf("\n");
                     text.deleteCharAt(text.length() - 1);
                 }
@@ -411,7 +428,7 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
         }
 
         htmlContent.append("""
-
+                
                 <script type="text/javascript">
                     document.querySelectorAll(".message").forEach(el => el.innerHTML = el.innerHTML.replaceAll(/at it\\.integry.*?(?:<br>)/g, '<b>$&</b>'));
                 </script>
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..6de4b2ab 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.Html;
 import android.text.SpannableString;
 import android.view.Gravity;
@@ -17,12 +18,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 +41,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;
@@ -94,6 +97,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     @Inject
     DialogInputQuantityV2View mDialogInputQuantityV2View;
 
+    @Inject
+    Handler handler;
+
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
 
     private final ObservableArrayList<SpedizioneListModel> mSpedizioneMutableData = new ObservableArrayList<>();
@@ -317,15 +323,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 +372,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 +425,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 +542,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 +598,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()));
@@ -710,30 +719,36 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     };
 
     public void addExtraItem() {
-        DialogScanArtView
-                .newInstance(!mEnableFakeGiacenza, (status, mtbAart, ean128Model, mtbColr) -> {
-                    if (status == DialogConsts.Results.YES) {
-                        this.mViewmodel.dispatchExtraItem(mtbAart, ean128Model, mtbColr);
-                    }
-                }, pickMagazzinoAutomaticoPosizione -> {
-                    this.onLoadingStarted();
-                    this.mViewmodel.executeEmptyMagazzinoAutomaticoRequest(pickMagazzinoAutomaticoPosizione, this::onLoadingEnded);
-                })
-                .show(getSupportFragmentManager(), "tag");
+        handler.post(() -> {
+            DialogScanArtView
+                    .newInstance(!mEnableFakeGiacenza, (status, mtbAart, ean128Model, mtbColr) -> {
+                        if (status == DialogConsts.Results.YES) {
+                            this.mViewmodel.dispatchExtraItem(mtbAart, ean128Model, mtbColr);
+                        }
+                    }, pickMagazzinoAutomaticoPosizione -> {
+                        this.onLoadingStarted();
+                        this.mViewmodel.executeEmptyMagazzinoAutomaticoRequest(pickMagazzinoAutomaticoPosizione, this::onLoadingEnded);
+                    })
+                    .show(getSupportFragmentManager(), "tag");
+        });
     }
 
     public void startManualSearch() {
-        BarcodeManager.disable();
-        DialogSimpleInputHelper.makeInputDialog(this, "Inserisci il codice a barre", codice -> {
+        handler.post(() -> {
+            BarcodeManager.disable();
+            DialogSimpleInputHelper.makeInputDialog(this, "Inserisci il codice a barre", codice -> {
 
-            this.onScanSuccessful.run(new BarcodeScanDTO().setStringValue(codice).setType(BarcodeType.CODE128));
-            BarcodeManager.enable();
+                this.onScanSuccessful.run(new BarcodeScanDTO().setStringValue(codice).setType(BarcodeType.CODE128));
+                BarcodeManager.enable();
 
-        }, BarcodeManager::enable).show();
+            }, BarcodeManager::enable).show();
+        });
     }
 
     public void removeListFilter() {
-        this.mViewmodel.resetMatchedRows();
+        handler.post(() -> {
+            this.mViewmodel.resetMatchedRows();
+        });
     }
 
 
@@ -749,26 +764,30 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
 
     public void trackPackaging() {
-        this.fabPopupMenu.dismiss();
+        handler.post(() -> {
+            this.fabPopupMenu.dismiss();
 
-        DialogTracciamentoImballiView.newInstance(imballiData -> {
+            DialogTracciamentoImballiView.newInstance(imballiData -> {
 
-            if (imballiData != null && !imballiData.isEmpty()) {
-                DialogAskVettoreView.newInstance(mViewmodel.getDefaultVettore(), vettoreData -> {
-                            mViewmodel.registraImballi(vettoreData, imballiData);
-                        })
-                        .show(getSupportFragmentManager(), DialogAskVettoreView.class.getName());
-            }
-        }).show(getSupportFragmentManager(), DialogTracciamentoImballiView.class.getName());
+                if (imballiData != null && !imballiData.isEmpty()) {
+                    DialogAskVettoreView.newInstance(mViewmodel.getDefaultVettore(), vettoreData -> {
+                                mViewmodel.registraImballi(vettoreData, imballiData);
+                            })
+                            .show(getSupportFragmentManager(), DialogAskVettoreView.class.getName());
+                }
+            }).show(getSupportFragmentManager(), DialogTracciamentoImballiView.class.getName());
+        });
     }
 
     public void showCreatedUL() {
-        this.fabPopupMenu.dismiss();
+        handler.post(() -> {
+            this.fabPopupMenu.dismiss();
 
-        ArrayList<MtbColt> createdMtbColts = this.mViewmodel.getCreatedMtbColts();
+            ArrayList<MtbColt> createdMtbColts = this.mViewmodel.getCreatedMtbColts();
 
-        Intent myIntent = ListaBancaliActivity.createIntent(this, createdMtbColts, true, false);
-        this.startActivityForResult(myIntent, PICK_UL_REQUEST);
+            Intent myIntent = ListaBancaliActivity.createIntent(this, createdMtbColts, true, false);
+            this.startActivityForResult(myIntent, PICK_UL_REQUEST);
+        });
     }
 
 
@@ -780,48 +799,60 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onLUOpened(MtbColt mtbColt) {
-        this.addExtraItemsEnabled.set(SettingsManager.iDB().isFlagCanAddExtraItemSpedizione());
-        noLUPresent.set(false);
+        handler.post(() -> {
+            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);
+            this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt);
+        });
     }
 
     @Override
     public void onLUClosed() {
-        this.addExtraItemsEnabled.set(false);
-        noLUPresent.set(true);
-        this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
+        handler.post(() -> {
+            this.addExtraItemsEnabled.set(false);
+            noLUPresent.set(true);
+            this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
 
-        if (this.mShouldCloseActivity) super.onBackPressed();
+            if (this.mShouldCloseActivity) super.onBackPressed();
+        });
     }
 
     @Override
     public void onLUPesoRequired(String codTcol, BigDecimal netWeightKG, BigDecimal grossWeightKG, RunnableArgsss<String, BigDecimal, BigDecimal> onComplete) {
-        DialogInputPesoLUView.newInstance(null, new BigDecimal(50), new BigDecimal(55), (newCodTcol, newNetWeight, newGrossWeight) -> {
-                    onComplete.run(newCodTcol, netWeightKG, grossWeightKG);
-                })
-                .show(getSupportFragmentManager(), "tag");
+        handler.post(() -> {
+            DialogInputPesoLUView.newInstance(null, new BigDecimal(50), new BigDecimal(55), (newCodTcol, newNetWeight, newGrossWeight) -> {
+                        onComplete.run(newCodTcol, netWeightKG, grossWeightKG);
+                    })
+                    .show(getSupportFragmentManager(), "tag");
+        });
     }
 
     @Override
     public void onLUSuccessullyPrinted() {
-        Resources res = getResources();
-        String errorMessage = res.getText(R.string.alert_print_completed_message).toString();
-        DialogSimpleMessageView
-                .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null)
-                .show(getSupportFragmentManager(), "tag");
+        handler.post(() -> {
+            Resources res = getResources();
+            String errorMessage = res.getText(R.string.alert_print_completed_message).toString();
+            DialogSimpleMessageView
+                    .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null)
+                    .show(getSupportFragmentManager(), "tag");
+        });
     }
 
     @Override
     public void onLUPrintRequest(RunnableArgs<Boolean> onComplete) {
-        DialogYesNoView.newInstance(getString(R.string.action_print),
-                        String.format(getString(R.string.message_print_packing_list), "Packing List"),
-                        result -> {
-                            onComplete.run(result == DialogConsts.Results.YES);
-                        })
-                .show(getSupportFragmentManager(), "dialog-print");
+        handler.post(() -> {
+            DialogYesNoView.newInstance(getString(R.string.action_print),
+                            String.format(getString(R.string.message_print_packing_list), "Packing List"),
+                            result -> {
+                                onComplete.run(result == DialogConsts.Results.YES);
+                            })
+                    .show(getSupportFragmentManager(), "dialog-print");
+        });
     }
 
     @Override
@@ -838,38 +869,49 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onFilterApplied(String newValue) {
-        this.mBindings.filteredArtsInListExpandableLayout.expand(true);
-        this.mBindings.descriptionFilterText.setText(!UtilityString.isNullOrEmpty(newValue) ? newValue : "");
+        handler.post(() -> {
+            this.mBindings.filteredArtsInListExpandableLayout.expand(true);
+            this.mBindings.descriptionFilterText.setText(!UtilityString.isNullOrEmpty(newValue) ? newValue : "");
+        });
     }
 
     @Override
     public void onFilterRemoved() {
-        this.mBindings.filteredArtsInListExpandableLayout.collapse(true);
-        this.mBindings.descriptionFilterText.setText("");
+        handler.post(() -> {
+            this.mBindings.filteredArtsInListExpandableLayout.collapse(true);
+            this.mBindings.descriptionFilterText.setText("");
+        });
     }
 
     @Override
     public void onMtbColrDeleteRequest(RunnableArgs<Boolean> onComplete) {
-        String text = getResources().getString(R.string.alert_delete_mtb_colr);
-        DialogSimpleMessageView.makeWarningDialog(new SpannableString(text),
-                        null,
-                        () -> onComplete.run(true),
-                        () -> onComplete.run(false)
-                )
-                .show(getSupportFragmentManager(), "tag");
+        handler.post(() -> {
+            String text = getResources().getString(R.string.alert_delete_mtb_colr);
+            DialogSimpleMessageView.makeWarningDialog(new SpannableString(text),
+                            null,
+                            () -> onComplete.run(true),
+                            () -> onComplete.run(false)
+                    )
+                    .show(getSupportFragmentManager(), "tag");
+        });
     }
 
     @Override
-    public void onError(Exception ex) {
-        this.onLoadingEnded();
+    public void onError(Exception ex, boolean useSnackbar) {
+        handler.post(() -> {
+            this.onLoadingEnded();
 
-        if (ex instanceof InvalidPesoKGException) {
-            UtilityToast.showToast(ex.getMessage());
-        } else {
-            UtilityExceptions.defaultException(this, ex);
-        }
+            if (ex instanceof InvalidPesoKGException) {
+                UtilityToast.showToast(ex.getMessage());
+            } else {
+                if (useSnackbar)
+                    Snackbar.make(mBindings.getRoot(), Objects.requireNonNull(ex.getMessage()), Snackbar.LENGTH_LONG).show();
+                else
+                    UtilityExceptions.defaultException(this, ex);
+            }
 
-        BarcodeManager.enable();
+            BarcodeManager.enable();
+        });
     }
 
     @Override
@@ -948,13 +990,13 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         DialogYesNoView.newInstance(null, "Vuoi cambiare la posizione della UL corrente?", result -> {
             switch (result) {
                 case YES:
-                    DialogAskPositionOfLUView.makeBase(false, (status, mtbDepoPosizione) -> {
+                    DialogAskPositionOfLUView.newInstance(false, (status, mtbDepoPosizione) -> {
                         if (status == DialogConsts.Results.ABORT) {
                             onComplete.run(false, null);
                         } else {
                             onComplete.run(true, mtbDepoPosizione);
                         }
-                    }, this::onError).show(getSupportFragmentManager(), "tag");
+                    }).show(getSupportFragmentManager(), "tag");
                     break;
 
                 case NO:
@@ -1046,7 +1088,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/SpedizioneModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java
index e2f150e2..53ac380c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java
@@ -1,5 +1,9 @@
 package it.integry.integrywmsnative.gest.spedizione;
 
+import android.os.Handler;
+
+import java.util.concurrent.ExecutorService;
+
 import dagger.Module;
 import dagger.Provides;
 import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
@@ -38,7 +42,9 @@ public class SpedizioneModule {
                                                     ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
                                                     MagazzinoAutomaticoRESTConsumer magazzinoAutomaticoRESTConsumer,
                                                     ImballiRESTConsumer imballiRESTConsumer,
-                                                    MagazzinoRESTConsumer magazzinoRESTConsumer) {
+                                                    MagazzinoRESTConsumer magazzinoRESTConsumer,
+                                                    ExecutorService executorService,
+                                                    Handler handler) {
         return new SpedizioneViewModel(articoloRESTConsumer,
                 barcodeRESTConsumer,
                 colliDataRecoverService,
@@ -51,7 +57,9 @@ public class SpedizioneModule {
                 colliLavorazioneRESTConsumer,
                 magazzinoAutomaticoRESTConsumer,
                 imballiRESTConsumer,
-                magazzinoRESTConsumer);
+                magazzinoRESTConsumer,
+                executorService,
+                handler);
     }
 
 }
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..7905910f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.gest.spedizione;
 
+import android.os.Handler;
+
 import androidx.databinding.ObservableArrayList;
 import androidx.lifecycle.MutableLiveData;
 
@@ -14,6 +16,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
@@ -22,7 +25,7 @@ import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
 import it.integry.integrywmsnative.core.exception.EmptyLUException;
-import it.integry.integrywmsnative.core.exception.InvalidCodMdepException;
+import it.integry.integrywmsnative.core.exception.InvalidCodMdepLUException;
 import it.integry.integrywmsnative.core.exception.InvalidLUException;
 import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
@@ -61,6 +64,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;
@@ -139,9 +143,13 @@ public class SpedizioneViewModel {
     private final MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer;
     private final ImballiRESTConsumer mImballiRESTConsumer;
 
+    private final ExecutorService executorService;
+    private final Handler handler;
+
     private ColliScaricoRESTConsumerInterface mColliScaricoRESTConsumer;
     private MagazzinoRESTConsumer magazzinoRESTConsumer;
 
+
     @Inject
     public SpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer,
                                BarcodeRESTConsumer barcodeRESTConsumer,
@@ -155,7 +163,9 @@ public class SpedizioneViewModel {
                                ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
                                MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer,
                                ImballiRESTConsumer imballiRESTConsumer,
-                               MagazzinoRESTConsumer magazzinoRESTConsumer) {
+                               MagazzinoRESTConsumer magazzinoRESTConsumer,
+                               ExecutorService executorService,
+                               Handler handler) {
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
         this.mColliDataRecoverService = colliDataRecoverService;
@@ -169,6 +179,8 @@ public class SpedizioneViewModel {
         this.mMagazzinoAutomaticoRESTConsumer = mMagazzinoAutomaticoRESTConsumer;
         this.mImballiRESTConsumer = imballiRESTConsumer;
         this.magazzinoRESTConsumer = magazzinoRESTConsumer;
+        this.executorService = executorService;
+        this.handler = handler;
     }
 
 
@@ -365,7 +377,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) {
@@ -571,7 +587,7 @@ public class SpedizioneViewModel {
 
                 if (codMdepIsValid) {
                     this.createNewLU(null, null, () -> searchArtFromUL(mtbColt, onComplete));
-                } else this.sendError(new InvalidCodMdepException());
+                } else this.sendError(new InvalidCodMdepLUException());
 
             }
 
@@ -609,14 +625,14 @@ 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()));
 
                     if (codMdepIsValid) {
                         this.searchArtFromUL(mtbColt, onComplete);
-                    } else this.sendError(new InvalidCodMdepException());
+                    } else this.sendError(new InvalidCodMdepLUException());
 
                 } else {
                     this.sendError(new EmptyLUException());
@@ -631,7 +647,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()
@@ -639,7 +655,7 @@ public class SpedizioneViewModel {
 
                     if (codMdepIsValid) {
                         searchArtFromUL(mtbColt, onComplete);
-                    } else this.sendError(new InvalidCodMdepException());
+                    } else this.sendError(new InvalidCodMdepLUException());
 
                 } else {
                     this.sendError(new InvalidLUException());
@@ -667,10 +683,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 +715,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 +899,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 +918,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 +976,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 +1118,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 +1146,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 +1250,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 +1317,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 +1411,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 +1490,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();
@@ -1501,7 +1529,7 @@ public class SpedizioneViewModel {
                 .findFirst()
                 .orElse(null);
 
-        if(!UtilityString.isNullOrEmpty(newTipoUL) && newMtbTcol == null) {
+        if (!UtilityString.isNullOrEmpty(newTipoUL) && newMtbTcol == null) {
             this.sendError(new Exception("Impossibile riconoscere il tipo UL " + newTipoUL));
             onComplete.run();
             return;
@@ -1660,6 +1688,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);
@@ -1981,16 +2026,17 @@ public class SpedizioneViewModel {
     }
 
     public void resetMatchedRows() {
-        for (PickingObjectDTO pickingObjectDTO : this.mPickingList.getValue()) {
-            pickingObjectDTO.setTempPickData(null).setHidden(false);
-        }
+        handler.post(() -> {
+            for (PickingObjectDTO pickingObjectDTO : this.mPickingList.getValue()) {
+                pickingObjectDTO.setTempPickData(null).setHidden(false);
+            }
 
-        this.mPickingList.postValue(this.mPickingList.getValue());
-        this.sendFilterRemoved();
+            this.mPickingList.postValue(this.mPickingList.getValue());
+            this.sendFilterRemoved();
+        });
     }
 
     public void closeOrder() {
-        this.sendOnLoadingStarted();
         if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) {
             this.sendOnCloseOrderPrintRequest(this::onCloseOrderPrintRequest);
         } else {
@@ -2057,7 +2103,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 +2150,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/VersamentoMerceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java
index f1f335a4..b4f5cf7f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java
@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.versamento_merce;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.Html;
 import android.text.SpannableString;
 import android.view.LayoutInflater;
@@ -34,8 +35,8 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.databinding.FragmentMainVersamentoMerceBinding;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
-import it.integry.integrywmsnative.view.dialogs.DialogAskLivelloPosizione;
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
+import it.integry.integrywmsnative.view.dialogs.ask_livello_posizione.DialogAskLivelloPosizioneView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrList;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
@@ -51,6 +52,9 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
     @Inject
     DialogInputQuantityV2View mDialogInputQuantityV2View;
 
+    @Inject
+    Handler handler;
+
     private FragmentMainVersamentoMerceBinding mBindings = null;
 
     private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
@@ -151,25 +155,26 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
 
     @Override
     public void onLivelloPosizioneRequired(MtbDepoPosizione posizione, RunnableArgs<MtbDepoPosizione> onComplete) {
-        this.getActivity().runOnUiThread(() -> {
-            DialogAskLivelloPosizione.make(getActivity(), posizione, false, onComplete, this::onError);
+        handler.post(() -> {
+            DialogAskLivelloPosizioneView.newInstance(posizione, false, onComplete, this::onError)
+                    .show(requireActivity().getSupportFragmentManager(), "ask-livello-posizione");
         });
     }
 
     @Override
     public void onSpostamentoTraDepConfirmRequired(String sourceCodMdep, String destinationCodMdep, RunnableArgs<Boolean> onComplete) {
-        this.getActivity().runOnUiThread(() -> {
+        handler.post(() -> {
             DialogSimpleMessageView.makeWarningDialog(Html.fromHtml("Stai spostando una UL dal deposito <b>" + sourceCodMdep + "</b> al deposito <b>" + destinationCodMdep + "</b>"),
                     null,
                     () -> onComplete.run(true),
                     () -> onComplete.run(false))
-                    .show(getActivity().getSupportFragmentManager(), "tag");
+                    .show(requireActivity().getSupportFragmentManager(), "tag");
         });
     }
 
     @Override
     public void onArtsChooseRequired(List<MtbColr> mtbColrList, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
-        this.requireActivity().runOnUiThread(() -> {
+        handler.post(() -> {
             DialogChooseArtsFromMtbColrList
                     .newInstance(mtbColrList, data -> {
                         if(data == null || data.isEmpty()) {
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..82389768 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
@@ -14,7 +14,7 @@ import java.util.List;
 import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
-import it.integry.integrywmsnative.core.exception.InvalidCodMdepException;
+import it.integry.integrywmsnative.core.exception.InvalidCodMdepLUException;
 import it.integry.integrywmsnative.core.exception.InvalidLUGestioneException;
 import it.integry.integrywmsnative.core.exception.NoArtsInLUException;
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
@@ -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 -> {
@@ -141,7 +141,7 @@ public class VersamentoMerceViewModel {
 
                     if (codMdepIsValid) {
                         pickMerceULtoUL(mtbColt, onComplete);
-                    } else this.sendError(new InvalidCodMdepException());
+                    } else this.sendError(new InvalidCodMdepLUException());
 
                 }, this::sendError);
             } else {
@@ -198,7 +198,7 @@ public class VersamentoMerceViewModel {
 
                     if (codMdepIsValid) {
                         pickMerceULtoUL(mtbColt, onComplete);
-                    } else this.sendError(new InvalidCodMdepException());
+                    } else this.sendError(new InvalidCodMdepLUException());
                 }
             }
 
@@ -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/bottom_sheet__item_edit/BottomSheetItemDTO.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemDTO.java
new file mode 100644
index 00000000..79b326e8
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemDTO.java
@@ -0,0 +1,79 @@
+package it.integry.integrywmsnative.view.bottom_sheet__item_edit;
+
+import java.math.BigDecimal;
+
+public class BottomSheetItemDTO<T> {
+
+    private T originalItem;
+
+    private String codMart;
+    private String partitaMag;
+    private String descrizione;
+
+    private BigDecimal qta;
+    private BigDecimal numCnf;
+    private String untMis;
+
+    public T getOriginalItem() {
+        return originalItem;
+    }
+
+    public BottomSheetItemDTO<T> setOriginalItem(T originalItem) {
+        this.originalItem = originalItem;
+        return this;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public BottomSheetItemDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public BottomSheetItemDTO<T> setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public BottomSheetItemDTO setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public BigDecimal getQta() {
+        return qta;
+    }
+
+    public BottomSheetItemDTO setQta(BigDecimal qta) {
+        this.qta = qta;
+        return this;
+    }
+
+    public BigDecimal getNumCnf() {
+        return numCnf;
+    }
+
+    public BottomSheetItemDTO setNumCnf(BigDecimal numCnf) {
+        this.numCnf = numCnf;
+        return this;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public BottomSheetItemDTO setUntMis(String untMis) {
+        this.untMis = untMis;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditDTO.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditDTO.java
deleted file mode 100644
index 3d07199b..00000000
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditDTO.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package it.integry.integrywmsnative.view.bottom_sheet__item_edit;
-
-import java.math.BigDecimal;
-
-public class BottomSheetItemEditDTO {
-
-    private String codMart;
-    private String descrizioneArticolo;
-
-    private BigDecimal qta;
-    private BigDecimal numCnf;
-    private String untMis;
-
-    public String getCodMart() {
-        return codMart;
-    }
-
-    public BottomSheetItemEditDTO setCodMart(String codMart) {
-        this.codMart = codMart;
-        return this;
-    }
-
-    public String getDescrizioneArticolo() {
-        return descrizioneArticolo;
-    }
-
-    public BottomSheetItemEditDTO setDescrizioneArticolo(String descrizioneArticolo) {
-        this.descrizioneArticolo = descrizioneArticolo;
-        return this;
-    }
-
-    public BigDecimal getQta() {
-        return qta;
-    }
-
-    public BottomSheetItemEditDTO setQta(BigDecimal qta) {
-        this.qta = qta;
-        return this;
-    }
-
-    public BigDecimal getNumCnf() {
-        return numCnf;
-    }
-
-    public BottomSheetItemEditDTO setNumCnf(BigDecimal numCnf) {
-        this.numCnf = numCnf;
-        return this;
-    }
-
-    public String getUntMis() {
-        return untMis;
-    }
-
-    public BottomSheetItemEditDTO setUntMis(String untMis) {
-        this.untMis = untMis;
-        return this;
-    }
-}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditView.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditView.java
index cfd2ca9c..df4a45b6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditView.java
@@ -1,18 +1,22 @@
 package it.integry.integrywmsnative.view.bottom_sheet__item_edit;
 
-import android.content.Context;
-import android.util.AttributeSet;
+import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.databinding.ObservableField;
 
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.databinding.BottomSheetItemEditViewBinding;
-import it.integry.integrywmsnative.view.bottom_sheet__base.BottomSheetFragmentBaseView;
 
-public class BottomSheetItemEditView extends BottomSheetFragmentBaseView {
+public class BottomSheetItemEditView extends BottomSheetDialogFragment {
 
 
     @Inject
@@ -21,33 +25,41 @@ public class BottomSheetItemEditView extends BottomSheetFragmentBaseView {
     public ObservableField<Boolean> enabledEditButton = new ObservableField<>(true);
     public ObservableField<Boolean> enabledDeleteButton = new ObservableField<>(true);
 
-    private final BottomSheetItemEditViewBinding mBinding;
+    private BottomSheetItemEditViewBinding mBinding;
     private Listener mListener;
 
-    public BottomSheetItemEditView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mBinding = BottomSheetItemEditViewBinding.inflate(LayoutInflater.from(context), this, true);
+    private final BottomSheetItemDTO<?> itemData;
+
+    public BottomSheetItemEditView(BottomSheetItemDTO<?> itemData) {
+        this.itemData = itemData;
+    }
+
+
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
         MainApplication.appComponent
                 .bottomSheetItemEditComponent()
                 .create()
                 .inject(this);
 
-
-
-        mBinding.setViewModel(mViewModel);
-        mBinding.setView(this);
+        mViewModel.init(this.itemData);
     }
 
-    public BottomSheetItemEditView setItem(BottomSheetItemEditDTO item) {
-        this.mBinding.invalidateAll();
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBinding = BottomSheetItemEditViewBinding.inflate(inflater, container, true);
 
-        this.mViewModel.init(item);
+        mBinding.setLifecycleOwner(this);
+        mBinding.setView(this);
+        mBinding.setViewModel(mViewModel);
 
-        this.mBinding.executePendingBindings();
-        this.parentView.requestLayout();
+        mBinding.executePendingBindings();
 
-        return this;
+        return mBinding.getRoot();
     }
 
     public BottomSheetItemEditView enableEditButton() {
@@ -73,36 +85,24 @@ public class BottomSheetItemEditView extends BottomSheetFragmentBaseView {
 
 
     public void editItem() {
-        if(this.mListener != null) this.mListener.onItemEdit();
-        this.collapse();
+        if(this.mListener != null) this.mListener.onItemEditRequest(itemData.getOriginalItem());
+        this.dismiss();
     }
 
     public void deleteItem() {
-        if(this.mListener != null) this.mListener.onItemDelete();
-        this.collapse();
+        if(this.mListener != null) this.mListener.onItemDeleteRequest(itemData.getOriginalItem());
+        this.dismiss();
     }
 
 
-
-    @Override
-    protected void onStateChangedCallback(State newState) {
-        if(newState == State.COLLAPSED) this.mViewModel.init(null);
-    }
-
-    @Override
-    protected void onSlideCallback(float slideOffset) {
-
-    }
-
-
-    public BottomSheetItemEditView setListener(Listener listener) {
+    public BottomSheetItemEditView setListener(Listener<?> listener) {
         this.mListener = listener;
         return this;
     }
 
-    public interface Listener {
-        void onItemEdit();
+    public interface Listener<U> {
+        void onItemEditRequest(U data);
 
-        void onItemDelete();
+        void onItemDeleteRequest(U data);
     }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditViewModel.java
index 0b7395b6..cdfac6e5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditViewModel.java
@@ -4,13 +4,13 @@ import androidx.lifecycle.MutableLiveData;
 
 public class BottomSheetItemEditViewModel {
 
-    private final MutableLiveData<BottomSheetItemEditDTO> mCurrentItem = new MutableLiveData<>();
+    private final MutableLiveData<BottomSheetItemDTO<?>> mCurrentItem = new MutableLiveData<>();
 
-    public void init(BottomSheetItemEditDTO item) {
+    public void init(BottomSheetItemDTO<?> item) {
         this.mCurrentItem.postValue(item);
     }
 
-    public MutableLiveData<BottomSheetItemEditDTO> getCurrentItem() {
+    public MutableLiveData<BottomSheetItemDTO<?>> getCurrentItem() {
         return mCurrentItem;
     }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java
index 61a8f461..03a1608f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java
@@ -12,13 +12,10 @@ import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 
 public class BottomSheetFragmentLUContentViewModel {
 
-
-
     public ObservableField<MtbColt> mtbColt = new ObservableField<>();
     public ObservableField<String> pesoKg = new ObservableField<>();
     public ObservableField<String> pesoNettoKg = new ObservableField<>();
     private Listener mListener;
-    private MtbColrListener mMtbColrListener;
 
     public void closeCurrentLU() {
         if (this.mListener != null) this.mListener.onBottomSheetLUClose();
@@ -42,11 +39,6 @@ public class BottomSheetFragmentLUContentViewModel {
         return this;
     }
 
-    public BottomSheetFragmentLUContentViewModel setMtbColrListener(MtbColrListener mtbColrListener) {
-        this.mMtbColrListener = mtbColrListener;
-        return this;
-    }
-
     public void refreshPesi() {
         MtbColt collo = this.mtbColt.get();
         if (collo == null) return;
@@ -77,8 +69,4 @@ public class BottomSheetFragmentLUContentViewModel {
 
         void onBottomSheetLUClose();
     }
-
-    public interface MtbColrListener {
-
-    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditModalView.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditModalView.java
index 18bd078c..38a6b5c6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditModalView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditModalView.java
@@ -35,6 +35,8 @@ public class BottomSheetMtbColrEditModalView extends BottomSheetDialogFragment {
     }
 
 
+
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -103,4 +105,78 @@ public class BottomSheetMtbColrEditModalView extends BottomSheetDialogFragment {
         void onMtbColrDelete(MtbColr mtbColr);
 
     }
+
+//    public static class Data<T> {
+//        private T originalItem;
+//        private String codMart;
+//        private String partitaMag;
+//        private String descrizione;
+//        private String untMis;
+//
+//        private BigDecimal qta;
+//        private BigDecimal numCnf;
+//
+//        public T getOriginalItem() {
+//            return originalItem;
+//        }
+//
+//        public Data<T> setOriginalItem(T originalItem) {
+//            this.originalItem = originalItem;
+//            return this;
+//        }
+//
+//        public String getCodMart() {
+//            return codMart;
+//        }
+//
+//        public Data<T> setCodMart(String codMart) {
+//            this.codMart = codMart;
+//            return this;
+//        }
+//
+//        public String getPartitaMag() {
+//            return partitaMag;
+//        }
+//
+//        public Data<T> setPartitaMag(String partitaMag) {
+//            this.partitaMag = partitaMag;
+//            return this;
+//        }
+//
+//        public String getDescrizione() {
+//            return descrizione;
+//        }
+//
+//        public Data<T> setDescrizione(String descrizione) {
+//            this.descrizione = descrizione;
+//            return this;
+//        }
+//
+//        public String getUntMis() {
+//            return untMis;
+//        }
+//
+//        public Data<T> setUntMis(String untMis) {
+//            this.untMis = untMis;
+//            return this;
+//        }
+//
+//        public BigDecimal getQta() {
+//            return qta;
+//        }
+//
+//        public Data<T> setQta(BigDecimal qta) {
+//            this.qta = qta;
+//            return this;
+//        }
+//
+//        public BigDecimal getNumCnf() {
+//            return numCnf;
+//        }
+//
+//        public Data<T> setNumCnf(BigDecimal numCnf) {
+//            this.numCnf = numCnf;
+//            return this;
+//        }
+//    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/components/ConfirmSwitchPreferenceCompat.java b/app/src/main/java/it/integry/integrywmsnative/view/components/ConfirmSwitchPreferenceCompat.java
new file mode 100644
index 00000000..4f791521
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/components/ConfirmSwitchPreferenceCompat.java
@@ -0,0 +1,55 @@
+package it.integry.integrywmsnative.view.components;
+
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.SwitchPreferenceCompat;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.view.dialogs.DialogConsts;
+import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
+
+public class ConfirmSwitchPreferenceCompat extends SwitchPreferenceCompat {
+
+    private final String confirmTitle;
+    private final String confirmMessage;
+
+    public ConfirmSwitchPreferenceCompat(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ConfirmSwitchPreferenceCompat);
+
+        String confirmTitle = a.getString(R.styleable.ConfirmSwitchPreferenceCompat_confirmTitle);
+        String confirmMessage = a.getString(R.styleable.ConfirmSwitchPreferenceCompat_confirmMessage);
+
+        a.recycle();
+
+        if(confirmTitle == null) confirmTitle = "Confirm";
+        if(confirmMessage == null) confirmMessage = "Are you sure you want to change this setting?";
+
+        this.confirmMessage = confirmMessage;
+        this.confirmTitle = confirmTitle;
+    }
+
+    @Override
+    protected void onClick() {
+        if (isChecked()) {
+            // showConfirmationDialog(false);
+            setChecked(false);
+        } else {
+            showConfirmationDialog(true);
+        }
+    }
+
+    private void showConfirmationDialog(final boolean newValue) {
+
+        DialogYesNoView.newInstance(confirmTitle, confirmMessage, result -> {
+            if(result == DialogConsts.Results.YES) {
+                setChecked(newValue);
+            }
+        }).show(((FragmentActivity) getContext()).getSupportFragmentManager(), "dialog-enable-beta");
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskLivelloPosizione.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskLivelloPosizione.java
deleted file mode 100644
index 5cd598e0..00000000
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskLivelloPosizione.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package it.integry.integrywmsnative.view.dialogs;
-
-import android.app.Dialog;
-import android.content.Context;
-
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.fragment.app.FragmentActivity;
-
-import com.google.android.material.textfield.TextInputLayout;
-
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
-import it.integry.integrywmsnative.core.utility.UtilityDialog;
-import it.integry.integrywmsnative.core.utility.UtilityFocus;
-import it.integry.integrywmsnative.core.utility.UtilityPosizione;
-
-public class DialogAskLivelloPosizione {
-
-
-    private Context mContext;
-    private MtbDepoPosizione mtbDepoPosizione;
-
-    private Dialog mDialog;
-
-    private RunnableArgs<MtbDepoPosizione> onComplete;
-    private RunnableArgs<Exception> onFailed;
-
-    private TextInputLayout livelloTextInputLayout;
-
-    private boolean completedFLow = false;
-
-    public static void make(FragmentActivity activity, MtbDepoPosizione mtbDepoPosizione, boolean canAbort, RunnableArgs<MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
-        activity.runOnUiThread(() -> {
-            new DialogAskLivelloPosizione(activity, mtbDepoPosizione, canAbort, onComplete, onFailed).mDialog.show();
-        });
-    }
-
-
-
-    public DialogAskLivelloPosizione(Context context, MtbDepoPosizione mtbDepoPosizione, boolean canAbort, RunnableArgs<MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
-        mContext = context;
-        this.mtbDepoPosizione = mtbDepoPosizione;
-        this.onComplete = onComplete;
-        this.onFailed = onFailed;
-
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
-        View currentView = inflater.inflate(R.layout.dialog_ask_livello_of_position, null, false);
-
-        mDialog = new Dialog(mContext);
-        mDialog.setContentView(currentView);
-        mDialog.setCanceledOnTouchOutside(false);
-        mDialog.setCancelable(false);
-        mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-
-        UtilityDialog.setTo90PercentWidth(mContext, mDialog);
-
-        mDialog.setOnDismissListener(dialog -> {
-            if(!completedFLow) onComplete.run(null);
-        });
-
-        mDialog.setOnShowListener(dialog -> {
-
-            if(!canAbort) currentView.findViewById(R.id.button_abort).setVisibility(View.GONE);
-
-
-            currentView.findViewById(R.id.button_confirm).setOnClickListener(v -> {
-                String levelNumber = ((TextView)currentView.findViewById(R.id.level_number)).getText().toString();
-                onLevelConfirm(levelNumber);
-            });
-
-            currentView.findViewById(R.id.button_abort).setOnClickListener(v -> {
-                onLevelAbort();
-            });
-
-            livelloTextInputLayout = currentView.findViewById(R.id.level_number_layout);
-
-
-            UtilityFocus.focusTextBox(mContext, livelloTextInputLayout.getEditText());
-            livelloTextInputLayout.getEditText().addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    if(livelloTextInputLayout.getEditText().getText() != null) {
-                        validateLevel(livelloTextInputLayout.getEditText().getText().toString());
-                    } else resetLevelError();
-                }
-
-                @Override
-                public void afterTextChanged(Editable s) {
-
-                }
-            });
-
-        });
-
-
-    }
-
-
-    private void onLevelConfirm(String levelString) {
-
-        String newPosizione = mtbDepoPosizione.getPosizione().substring(0, mtbDepoPosizione.getPosizione().length()-1);
-        newPosizione += levelString;
-
-        MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(newPosizione);
-
-        if(foundPosizione != null) {
-            resetLevelError();
-
-            completedFLow = true;
-            onComplete.run(foundPosizione);
-            mDialog.dismiss();
-
-
-        } else {
-            setLevelError(mContext.getResources().getString(R.string.not_valid));
-        }
-    }
-
-
-    private void validateLevel(String levelString) {
-        String newPosizione = mtbDepoPosizione.getPosizione().substring(0, mtbDepoPosizione.getPosizione().length()-1);
-        newPosizione += levelString;
-
-        if(UtilityPosizione.getFromCache(newPosizione) != null) {
-            resetLevelError();
-        } else setLevelError(mContext.getResources().getString(R.string.not_valid));
-    }
-
-    private void setLevelError(String message){
-        livelloTextInputLayout.setErrorEnabled(true);
-        livelloTextInputLayout.setError(message);
-        livelloTextInputLayout.setErrorIconDrawable(null);
-    }
-
-    private void resetLevelError() {
-        livelloTextInputLayout.setError(null);
-    }
-
-
-    private void onLevelAbort() {
-        completedFLow = true;
-        onComplete.run(null);
-        mDialog.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..dc04761d 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,46 @@ 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()) {
+                    try {
+                        manager.executePendingTransactions();
+                    } catch (IllegalStateException e) {
+                        //ignore
+                        String a = "";
+                    }
+                    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();
+                if (!getParentFragmentManager().isDestroyed()) {
+                    try {
+                        getParentFragmentManager().executePendingTransactions();
+                    } catch (IllegalStateException e) {
+                        //ignore
+                        String a = "";
+                    }
+                }
+            }
+
+        });
     }
 
     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..26ada95a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Cliente_ArrayAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Cliente_ArrayAdapter.java
@@ -37,7 +37,7 @@ public class DialogAskCliente_Page1_Cliente_ArrayAdapter extends ArrayAdapter<Di
     public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
         View listItem = convertView;
         if(listItem == null) {
-            listItem = LayoutInflater.from(mContext).inflate(R.layout.dropdown_simple_item_w_subtitle, parent, false);
+            listItem = LayoutInflater.from(mContext).inflate(R.layout.dropdown_simple_item_w_subtitle_bottom, parent, false);
         }
 
         if(position < mDataset.size()) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_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_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_deposito/DialogAskDepositoComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoComponent.java
new file mode 100644
index 00000000..523ef83d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.ask_deposito;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogAskDepositoComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogAskDepositoComponent create();
+    }
+
+    void inject(DialogAskDepositoView dialogAskDepositoView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoModule.java
new file mode 100644
index 00000000..6f071a8c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoModule.java
@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.view.dialogs.ask_deposito;
+
+import android.os.Handler;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+
+@Module(subcomponents = DialogAskDepositoComponent.class)
+public class DialogAskDepositoModule {
+
+    @Provides
+    DialogAskDepositoViewModel providesDialogAskDepositoViewModel(Handler handler, BarcodeRESTConsumer barcodeRESTConsumer) {
+        return new DialogAskDepositoViewModel(handler, barcodeRESTConsumer);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoView.java
new file mode 100644
index 00000000..664a97dd
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoView.java
@@ -0,0 +1,126 @@
+package it.integry.integrywmsnative.view.dialogs.ask_deposito;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.util.concurrent.ExecutorService;
+
+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.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.databinding.DialogAskDepositoBinding;
+
+public class DialogAskDepositoView extends BaseDialogFragment implements DialogAskDepositoViewModel.Listener {
+
+
+    @Inject
+    DialogAskDepositoViewModel mViewModel;
+
+    @Inject
+    ExecutorService executorService;
+
+    private DialogAskDepositoBinding mBindings;
+    private Context mContext;
+
+    private int mBarcodeScannerIstanceID;
+
+    private final RunnableArgs<String> onComplete;
+
+    //Pass here all external parameters
+    public static DialogAskDepositoView newInstance(RunnableArgs<String> onComplete) {
+        return new DialogAskDepositoView(onComplete);
+    }
+
+    private DialogAskDepositoView(RunnableArgs<String> onComplete) {
+        super();
+        this.onComplete = onComplete;
+
+        MainApplication.appComponent
+                .dialogAskDepositoComponent()
+                .create()
+                .inject(this);
+    }
+
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogAskDepositoBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+
+        setCancelable(true);
+
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .setNeutralButton(R.string.abort, null)
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+        return alertDialog;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        this.initBarcode();
+        mViewModel.setListener(this);
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        super.onDismiss(dialog);
+        BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
+
+        if (onComplete != null) onComplete.run(mViewModel.getCodMdep().getValue());
+    }
+
+    @Override
+    public void dismiss() {
+        if (getDialog() != null) getDialog().dismiss();
+    }
+
+
+    private void initBarcode() {
+        mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessful(onScanSuccessful)
+                .setOnScanFailed(this::onError));
+    }
+
+
+    private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
+        this.onLoadingStarted();
+
+        executorService.execute(() -> {
+            try {
+                this.mViewModel.processBarcodeDTO(data);
+                this.onLoadingEnded();
+            } catch (Exception e) {
+                this.onError(e);
+            }
+        });
+    };
+
+    @Override
+    public void onDepositoLoaded() {
+        dismiss();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoViewModel.java
new file mode 100644
index 00000000..79e79f35
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoViewModel.java
@@ -0,0 +1,78 @@
+package it.integry.integrywmsnative.view.dialogs.ask_deposito;
+
+import android.os.Handler;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.exception.InvalidCodMdepBarcodeException;
+import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.utility.UtilityBarcode;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+
+public class DialogAskDepositoViewModel {
+
+    Handler handler;
+    BarcodeRESTConsumer barcodeRESTConsumer;
+
+    private MutableLiveData<String> codMdep = new MutableLiveData<>();
+    private Listener listener;
+
+    public DialogAskDepositoViewModel(Handler handler, BarcodeRESTConsumer barcodeRESTConsumer) {
+        this.handler = handler;
+        this.barcodeRESTConsumer = barcodeRESTConsumer;
+    }
+
+    public LiveData<String> getCodMdep() {
+        return codMdep;
+    }
+
+    public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) throws Exception {
+        if (UtilityBarcode.isEan128(barcodeScanDTO)) {
+            this.executeEtichettaEan128(barcodeScanDTO);
+        } else
+            throw new NoResultFromBarcodeException(barcodeScanDTO.getStringValue());
+
+
+    }
+
+    private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO) throws Exception {
+        var ean128Model = barcodeRESTConsumer.decodeEan128Synchronized(barcodeScanDTO);
+
+        if (UtilityString.isNullOrEmpty(ean128Model.Internal4)) {
+            throw new InvalidCodMdepBarcodeException(barcodeScanDTO.getStringValue());
+        }
+
+//        AvailableCodMdepsDTO availableCodMdepsDTO = SettingsManager.iDB().getAvailableCodMdep().stream()
+//                .filter(x -> x.getCodMdep().equalsIgnoreCase(ean128Model.Internal4))
+//                .findFirst()
+//                .orElse(null);
+//
+//        if (availableCodMdepsDTO == null) {
+//            throw new InvalidCodMdepBarcodeException(barcodeScanDTO.getStringValue());
+//        }
+
+        handler.post(() -> {
+            this.codMdep.setValue(ean128Model.Internal4);
+            this.sendOnDepositoLoaded();
+        });
+    }
+
+    private void sendOnDepositoLoaded() {
+        if (listener != null) {
+            listener.onDepositoLoaded();
+        }
+    }
+
+    public void setListener(Listener listener) {
+        this.listener = listener;
+    }
+
+    public interface Listener {
+
+        void onDepositoLoaded();
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_livello_posizione/DialogAskLivelloPosizioneComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_livello_posizione/DialogAskLivelloPosizioneComponent.java
new file mode 100644
index 00000000..b3876750
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_livello_posizione/DialogAskLivelloPosizioneComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.ask_livello_posizione;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogAskLivelloPosizioneComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogAskLivelloPosizioneComponent create();
+    }
+
+    void inject(DialogAskLivelloPosizioneView dialogAskLivelloPosizioneView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_livello_posizione/DialogAskLivelloPosizioneModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_livello_posizione/DialogAskLivelloPosizioneModule.java
new file mode 100644
index 00000000..dc220be8
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_livello_posizione/DialogAskLivelloPosizioneModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.ask_livello_posizione;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogAskLivelloPosizioneComponent.class)
+public class DialogAskLivelloPosizioneModule {
+
+    @Provides
+    DialogAskLivelloPosizioneViewModel providesDialogAskLivelloPosizioneViewModel() {
+        return new DialogAskLivelloPosizioneViewModel();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_livello_posizione/DialogAskLivelloPosizioneView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_livello_posizione/DialogAskLivelloPosizioneView.java
new file mode 100644
index 00000000..f91b0b95
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_livello_posizione/DialogAskLivelloPosizioneView.java
@@ -0,0 +1,177 @@
+package it.integry.integrywmsnative.view.dialogs.ask_livello_posizione;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+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.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.utility.UtilityFocus;
+import it.integry.integrywmsnative.core.utility.UtilityPosizione;
+import it.integry.integrywmsnative.databinding.DialogAskLivelloPosizioneBinding;
+
+public class DialogAskLivelloPosizioneView extends BaseDialogFragment {
+
+    @Inject
+    DialogAskLivelloPosizioneViewModel mViewModel;
+
+    private MtbDepoPosizione mtbDepoPosizione;
+
+    private boolean canAbort;
+    private RunnableArgs<MtbDepoPosizione> onComplete;
+    private RunnableArgs<Exception> onFailed;
+
+    private DialogAskLivelloPosizioneBinding mBindings;
+    private Context mContext;
+
+    private boolean completedFLow = false;
+
+    //Pass here all external parameters
+    public static DialogAskLivelloPosizioneView newInstance(MtbDepoPosizione mtbDepoPosizione, boolean canAbort, RunnableArgs<MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
+        return new DialogAskLivelloPosizioneView(mtbDepoPosizione, canAbort, onComplete, onFailed);
+    }
+
+    private DialogAskLivelloPosizioneView(MtbDepoPosizione mtbDepoPosizione, boolean canAbort, RunnableArgs<MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
+        super();
+
+        this.mtbDepoPosizione = mtbDepoPosizione;
+        this.onComplete = onComplete;
+        this.onFailed = onFailed;
+        this.canAbort = canAbort;
+
+        MainApplication.appComponent
+                .dialogAskLivelloPosizioneComponent()
+                .create()
+                .inject(this);
+    }
+
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogAskLivelloPosizioneBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+
+        setCancelable(false);
+
+        var alertDialogBuilder = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .setPositiveButton(R.string.confirm, (dialogInterface, i) -> {
+                    String levelNumber = mBindings.levelNumber.getText().toString();
+                    onLevelConfirm(levelNumber);
+                });
+
+        if (canAbort)
+            alertDialogBuilder.setNeutralButton(R.string.abort, ((dialogInterface, i) -> {
+                onLevelAbort();
+            }));
+
+        var alertDialog = alertDialogBuilder.create();
+
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+        return alertDialog;
+    }
+
+    @Override
+    public void dismiss() {
+        if (getDialog() != null) getDialog().dismiss();
+    }
+
+    @Override
+    public void onShow(DialogInterface dialogInterface) {
+
+        UtilityFocus.focusTextBox(mContext, mBindings.levelNumberLayout.getEditText());
+        mBindings.levelNumberLayout.getEditText().addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (mBindings.levelNumberLayout.getEditText().getText() != null) {
+                    validateLevel(mBindings.levelNumberLayout.getEditText().getText().toString());
+                } else resetLevelError();
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        super.onDismiss(dialog);
+
+        if(!completedFLow) onComplete.run(null);
+    }
+
+
+    private void onLevelConfirm(String levelString) {
+
+        String newPosizione = mtbDepoPosizione.getPosizione().substring(0, mtbDepoPosizione.getPosizione().length() - 1);
+        newPosizione += levelString;
+
+        MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(newPosizione);
+
+        if (foundPosizione != null) {
+            resetLevelError();
+
+            completedFLow = true;
+            onComplete.run(foundPosizione);
+            dismiss();
+
+
+        } else {
+            setLevelError(mContext.getResources().getString(R.string.not_valid));
+        }
+    }
+
+
+    private void validateLevel(String levelString) {
+        String newPosizione = mtbDepoPosizione.getPosizione().substring(0, mtbDepoPosizione.getPosizione().length() - 1);
+        newPosizione += levelString;
+
+        if (UtilityPosizione.getFromCache(newPosizione) != null) {
+            resetLevelError();
+        } else setLevelError(mContext.getResources().getString(R.string.not_valid));
+    }
+
+    private void setLevelError(String message) {
+        mBindings.levelNumberLayout.setErrorEnabled(true);
+        mBindings.levelNumberLayout.setError(message);
+        mBindings.levelNumberLayout.setErrorIconDrawable(null);
+    }
+
+    private void resetLevelError() {
+        mBindings.levelNumberLayout.setError(null);
+    }
+
+
+    private void onLevelAbort() {
+        completedFLow = true;
+        onComplete.run(null);
+        dismiss();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_livello_posizione/DialogAskLivelloPosizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_livello_posizione/DialogAskLivelloPosizioneViewModel.java
new file mode 100644
index 00000000..608ceaf3
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_livello_posizione/DialogAskLivelloPosizioneViewModel.java
@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.view.dialogs.ask_livello_posizione;
+
+public class DialogAskLivelloPosizioneViewModel  {
+
+}
\ 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/ask_position_of_lu/DialogAskPositionOfLUComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUComponent.java
new file mode 100644
index 00000000..73dbbc57
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.ask_position_of_lu;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogAskPositionOfLUComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogAskPositionOfLUComponent create();
+    }
+
+    void inject(DialogAskPositionOfLUView dialogAskPositionOfLUView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUModule.java
new file mode 100644
index 00000000..12d1cb38
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.ask_position_of_lu;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogAskPositionOfLUComponent.class)
+public class DialogAskPositionOfLUModule {
+
+    @Provides
+    DialogAskPositionOfLUViewModel providesDialogAskPositionOfLUViewModel() {
+        return new DialogAskPositionOfLUViewModel();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUView.java
index d6d538d5..ee0f31c6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUView.java
@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.view.dialogs.ask_position_of_lu;
 
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.text.Editable;
@@ -20,7 +21,10 @@ import com.google.android.material.textfield.TextInputLayout;
 import java.util.ArrayList;
 import java.util.List;
 
+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;
@@ -33,41 +37,49 @@ import it.integry.integrywmsnative.core.utility.UtilityPosizione;
 import it.integry.integrywmsnative.databinding.DialogAskPositionOfLuBinding;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 
-public class DialogAskPositionOfLUView extends BaseDialogFragment implements DialogInterface.OnShowListener {
+public class DialogAskPositionOfLUView extends BaseDialogFragment {
+
+
+    @Inject
+    DialogAskPositionOfLUViewModel mViewModel;
 
     private DialogAskPositionOfLuBinding mBindings;
     private DialogAskPositionOfLUAdapter viewpagerAdapter;
-    private int mBarcodeScannerIstanceID;
-
-    private boolean mCheckForLineaProd;
+    private Context mContext;
+    private int mBarcodeScannerInstanceID;
 
     private MtbDepoPosizione currentMtbDepoPosizione;
 
-    private RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete;
-    private RunnableArgs<Exception> onFailed;
-
-    private TextInputLayout livelloTextInputLayout;
+    private boolean mCheckForLineaProd = false;
+    private RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete = null;
 
     private boolean completedFlow = false;
+    private TextInputLayout livelloTextInputLayout;
 
-    public static DialogAskPositionOfLUView makeBase(boolean checkForLineaProd, RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
-        return new DialogAskPositionOfLUView(checkForLineaProd, onComplete, onFailed);
+    //Pass here all external parameters
+    public static DialogAskPositionOfLUView newInstance(boolean checkForLineaProd, RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete) {
+        return new DialogAskPositionOfLUView(checkForLineaProd, onComplete);
     }
 
-    private DialogAskPositionOfLUView(boolean checkForLineaProd, RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
+    private DialogAskPositionOfLUView(boolean checkForLineaProd, RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete) {
         super();
 
         this.mCheckForLineaProd = checkForLineaProd;
         this.onComplete = onComplete;
-        this.onFailed = onFailed;
+
+        MainApplication.appComponent
+                .dialogAskPositionOfLUComponent()
+                .create()
+                .inject(this);
     }
 
+
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        this.initBarcode();
+        this.mContext = requireContext();
 
-        mBindings = DialogAskPositionOfLuBinding.inflate(LayoutInflater.from(requireActivity()), null, false);
+        mBindings = DialogAskPositionOfLuBinding.inflate(LayoutInflater.from(this.mContext), null, false);
         mBindings.setLifecycleOwner(this);
 
         List<Integer> views = new ArrayList<>();
@@ -78,11 +90,16 @@ public class DialogAskPositionOfLUView extends BaseDialogFragment implements Dia
         mBindings.viewpager.setAdapter(viewpagerAdapter);
         mBindings.viewpager.beginFakeDrag();
 
-        var alertDialog = new MaterialAlertDialogBuilder(requireContext())
+        this.initBarcode();
+
+        setCancelable(false);
+
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
                 .setView(mBindings.getRoot())
-                .setCancelable(false)
+                .setCancelable(isCancelable())
                 .create();
-        alertDialog.setCanceledOnTouchOutside(false);
+
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
         alertDialog.setOnShowListener(this);
         return alertDialog;
     }
@@ -97,6 +114,11 @@ public class DialogAskPositionOfLUView extends BaseDialogFragment implements Dia
         }
     }
 
+    @Override
+    public void dismiss() {
+        if (getDialog() != null) getDialog().dismiss();
+    }
+
     @Override
     public void onShow(DialogInterface dialog) {
         ((AppCompatTextView) viewpagerAdapter.getPage(0)
@@ -142,7 +164,7 @@ public class DialogAskPositionOfLUView extends BaseDialogFragment implements Dia
     }
 
     private void initBarcode() {
-        mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+        mBarcodeScannerInstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
                 .setOnScanSuccessful(onScanSuccessfull)
                 .setOnScanFailed(this::onError));
 
@@ -151,7 +173,7 @@ public class DialogAskPositionOfLUView extends BaseDialogFragment implements Dia
 
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
-        BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
+        BarcodeManager.removeCallback(mBarcodeScannerInstanceID);
         if (!completedFlow) onComplete.run(DialogConsts.Results.ABORT, null);
         super.onDismiss(dialog);
     }
@@ -237,4 +259,5 @@ public class DialogAskPositionOfLUView extends BaseDialogFragment implements Dia
         onComplete.run(DialogConsts.Results.ABORT, null);
         dismiss();
     }
-}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUViewModel.java
new file mode 100644
index 00000000..2ed9b2cb
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUViewModel.java
@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.view.dialogs.ask_position_of_lu;
+
+public class DialogAskPositionOfLUViewModel {
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUComponent.java
new file mode 100644
index 00000000..362bb677
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.basket_lu;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogBasketLUComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogBasketLUComponent create();
+    }
+
+    void inject(DialogBasketLUView dialogBasketLUView);
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUModule.java
new file mode 100644
index 00000000..b8714c7c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUModule.java
@@ -0,0 +1,22 @@
+package it.integry.integrywmsnative.view.dialogs.basket_lu;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page1.DialogBasketLU_Page1_ViewModel;
+import it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page2.DialogBasketLU_Page2_ViewModel;
+
+@Module(subcomponents = DialogBasketLUComponent.class)
+public class DialogBasketLUModule {
+
+    @Provides
+    DialogBasketLU_Page1_ViewModel providesDialogBasketLUPage1ViewModel(ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer) {
+        return new DialogBasketLU_Page1_ViewModel(colliMagazzinoRESTConsumer);
+    }
+
+    @Provides
+    DialogBasketLU_Page2_ViewModel providesDialogBasketLUPage2ViewModel() {
+        return new DialogBasketLU_Page2_ViewModel();
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUView.java
index 40ee7a73..7c6d90c2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUView.java
@@ -14,16 +14,25 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+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.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.databinding.DialogBasketLuBinding;
+import it.integry.integrywmsnative.view.dialogs.basket_lu.interfaces.IDialogBasketLUViewModel;
 import it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page1.DialogBasketLU_Page1_ViewModel;
 import it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page2.DialogBasketLU_Page2_ViewModel;
 
 public class DialogBasketLUView extends BaseDialogFragment {
 
+    @Inject
+    DialogBasketLU_Page1_ViewModel dialogBasketLUPage1ViewModel;
+    @Inject
+    DialogBasketLU_Page2_ViewModel dialogBasketLUPage2ViewModel;
+
     private final RunnableArgs<MtbColt> mOnComplete;
     private DialogBasketLuBinding mBindings;
 
@@ -31,6 +40,11 @@ public class DialogBasketLUView extends BaseDialogFragment {
 
     public DialogBasketLUView(RunnableArgs<MtbColt> onComplete) {
         mOnComplete = onComplete;
+
+        MainApplication.appComponent
+                .dialogBasketLUComponent()
+                .create()
+                .inject(this);
     }
 
     @NonNull
@@ -51,9 +65,9 @@ public class DialogBasketLUView extends BaseDialogFragment {
     }
 
     private void initViewPager(Dialog dialog) {
-        List<Map.Entry<Integer, Class<?>>> views = new ArrayList<>();
-        views.add(new AbstractMap.SimpleEntry<>(R.layout.dialog_basket_lu__page1, DialogBasketLU_Page1_ViewModel.class));
-        views.add(new AbstractMap.SimpleEntry<>(R.layout.dialog_basket_lu__page2, DialogBasketLU_Page2_ViewModel.class));
+        List<Map.Entry<Integer, IDialogBasketLUViewModel>> views = new ArrayList<>();
+        views.add(new AbstractMap.SimpleEntry<>(R.layout.dialog_basket_lu__page1, dialogBasketLUPage1ViewModel));
+        views.add(new AbstractMap.SimpleEntry<>(R.layout.dialog_basket_lu__page2, dialogBasketLUPage2ViewModel));
 
         DialogBasketLU_ViewPagerAdapter viewPagerAdapter = new DialogBasketLU_ViewPagerAdapter(requireContext(), views);
         mBindings.viewpager.setAdapter(viewPagerAdapter);
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU_ViewPagerAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU_ViewPagerAdapter.java
index 1dafa3db..6a54b1d5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU_ViewPagerAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU_ViewPagerAdapter.java
@@ -24,12 +24,12 @@ public class DialogBasketLU_ViewPagerAdapter extends PagerAdapter implements Vie
 
     private final Context mContext;
 
-    private final List<Map.Entry<Integer, Class<?>>> mDatasetLayout;
+    private final List<Map.Entry<Integer, IDialogBasketLUViewModel>> mDatasetLayout;
     private final List<Map.Entry<ViewDataBinding, IDialogBasketLUViewModel>> mDatasetViews;
 
     private DeactivatableViewPager viewPager;
 
-    public DialogBasketLU_ViewPagerAdapter(Context context, List<Map.Entry<Integer, Class<?>>> datasetLayouts) {
+    public DialogBasketLU_ViewPagerAdapter(Context context, List<Map.Entry<Integer, IDialogBasketLUViewModel>> datasetLayouts) {
         this.mContext = context;
         this.mDatasetLayout = datasetLayouts;
         this.mDatasetViews = new ArrayList<>();
@@ -45,32 +45,28 @@ public class DialogBasketLU_ViewPagerAdapter extends PagerAdapter implements Vie
         LayoutInflater inflater = (LayoutInflater) mContext.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
         ViewDataBinding mBinding = DataBindingUtil.inflate(inflater, viewId, null, false);
 
-        Class<?> viewModelClass = mDatasetLayout.get(position).getValue();
-        IDialogBasketLUViewModel viewModel = null;
+//        Class<?> viewModelClass = mDatasetLayout.get(position).getValue();
+        IDialogBasketLUViewModel viewModel = mDatasetLayout.get(position).getValue();
 
-        try {
-            viewModel = (IDialogBasketLUViewModel) viewModelClass.newInstance();
-            viewModel.setBinding(mBinding);
-            viewModel.setContext(mContext);
-            viewModel.setOnDone(data -> {
-                int newIndex = viewPager.getCurrentItem() + 1;
+        //            viewModel = (IDialogBasketLUViewModel) viewModelClass.newInstance();
+        viewModel.setBinding(mBinding);
+        viewModel.setContext(mContext);
+        viewModel.setOnDone(data -> {
+            int newIndex = viewPager.getCurrentItem() + 1;
 
-                if(newIndex <= getCount()) {
-                    this.mDatasetViews.get(newIndex).getValue().setInputData(data);
-                    this.mDatasetViews.get(newIndex).getValue().onPreShow();
-                    viewPager.setCurrentItem(newIndex, true);
-                }
-            });
-            viewModel.setOnPrev(() -> {
-                int newIndex = viewPager.getCurrentItem() - 1;
+            if(newIndex <= getCount()) {
+                this.mDatasetViews.get(newIndex).getValue().setInputData(data);
+                this.mDatasetViews.get(newIndex).getValue().onPreShow();
+                viewPager.setCurrentItem(newIndex, true);
+            }
+        });
+        viewModel.setOnPrev(() -> {
+            int newIndex = viewPager.getCurrentItem() - 1;
 
-                if(newIndex >= 0) {
-                    viewPager.setCurrentItem(newIndex, true);
-                }
-            });
-        } catch (IllegalAccessException | InstantiationException e) {
-            e.printStackTrace();
-        }
+            if(newIndex >= 0) {
+                viewPager.setCurrentItem(newIndex, true);
+            }
+        });
 
         mBinding.setVariable(it.integry.integrywmsnative.BR.viewmodel, viewModel);
 
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..d71dff93 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
@@ -9,6 +9,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
@@ -26,6 +28,13 @@ public class DialogBasketLU_Page1_ViewModel extends DialogBasketLU_BaseViewModel
     private List<MtbColt> availableMtbColts;
     private DialogBasketLU_Page1_ListAdapter mAdapter;
 
+    private final ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer;
+
+    @Inject
+    public DialogBasketLU_Page1_ViewModel(ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer) {
+        this.colliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
+    }
+
     @Override
     public void setContext(Context context) {
         this.mContext = context;
@@ -47,11 +56,11 @@ public class DialogBasketLU_Page1_ViewModel extends DialogBasketLU_BaseViewModel
 
         mBinding.constraintLayout.setMaxHeight((int) (mContext.getResources().getDisplayMetrics().heightPixels * 0.75));
 
-        ColliMagazzinoRESTConsumer.retrieveBasketColli(mtbColts -> {
+        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/extra_info/DialogExtraInfoComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/extra_info/DialogExtraInfoComponent.java
new file mode 100644
index 00000000..2a360a2b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/extra_info/DialogExtraInfoComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.extra_info;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogExtraInfoComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogExtraInfoComponent create();
+    }
+
+    void inject(DialogExtraInfoView dialogExtraInfoView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/extra_info/DialogExtraInfoModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/extra_info/DialogExtraInfoModule.java
new file mode 100644
index 00000000..13ae3fd7
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/extra_info/DialogExtraInfoModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.extra_info;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogExtraInfoComponent.class)
+public class DialogExtraInfoModule {
+
+    @Provides
+    DialogExtraInfoViewModel providesDialogExtraInfoViewModel() {
+        return new DialogExtraInfoViewModel();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/extra_info/DialogExtraInfoView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/extra_info/DialogExtraInfoView.java
new file mode 100644
index 00000000..d56209df
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/extra_info/DialogExtraInfoView.java
@@ -0,0 +1,96 @@
+package it.integry.integrywmsnative.view.dialogs.extra_info;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Bitmap;
+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.barcode_base_android_library.model.BarcodeType;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityBarcode;
+import it.integry.integrywmsnative.databinding.DialogExtraInfoBinding;
+
+public class DialogExtraInfoView extends BaseDialogFragment {
+
+    @Inject
+    DialogExtraInfoViewModel mViewModel;
+
+    private DialogExtraInfoBinding mBindings;
+    private Context mContext;
+
+
+    private static final char FNC1 = 0x00f1;
+
+    //Pass here all external parameters
+    public static DialogExtraInfoView newInstance() {
+        return new DialogExtraInfoView();
+    }
+
+    private DialogExtraInfoView() {
+        super();
+
+        MainApplication.appComponent
+                .dialogExtraInfoComponent()
+                .create()
+                .inject(this);
+    }
+
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogExtraInfoBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+
+        setCancelable(true);
+
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .setNeutralButton(R.string.action_close, null)
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+        return alertDialog;
+    }
+
+    @Override
+    public void dismiss() {
+        if (getDialog() != null) getDialog().dismiss();
+    }
+
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        try {
+            this.initDepositBarcodeBitmap();
+        } catch (Exception e) {
+            this.onError(e);
+        }
+    }
+
+    private void initDepositBarcodeBitmap() throws Exception {
+        String currentCodMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+        String barcode = "94" + currentCodMdep;
+
+        Bitmap barcodeBitmap = UtilityBarcode.generateBarcodeImage(barcode, BarcodeType.EAN128, 500, 170);
+        mBindings.barcodeCurrentDeposit.setImageBitmap(barcodeBitmap);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/extra_info/DialogExtraInfoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/extra_info/DialogExtraInfoViewModel.java
new file mode 100644
index 00000000..454f6a7b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/extra_info/DialogExtraInfoViewModel.java
@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.view.dialogs.extra_info;
+
+public class DialogExtraInfoViewModel {
+
+}
\ No newline at end of file
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..015e0263 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;
 
@@ -106,7 +104,7 @@ public class DialogInputPesoLUView extends BaseDialogFragment {
 
         List<String> codTcolDescriptions = codTcolList.stream()
                 .map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione())
-                .toList();
+                .collect(Collectors.toList());
 
         if (codTcol.get() != null) {
             Optional<String> newCodTcol = this.codTcolList.stream()
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..d6216d92 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)));
             }
         }
     }
@@ -267,8 +267,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
 
                 if (validated) {
                     this.mAbort = false;
-                    dismiss();
-                    this.mOnComplete.run(this.mViewModel.getResult(), false);
+                    dismiss(this.mViewModel.getResult(), false);
                 }
             });
         });
@@ -278,14 +277,29 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         this.mViewModel.validate(validated -> {
             if (validated) {
                 this.mAbort = false;
-                dismiss();
-                this.mOnComplete.run(this.mViewModel.getResult(), true);
+                dismiss(this.mViewModel.getResult(), true);
             } else {
                 this.onLoadingEnded();
             }
         });
     }
 
+    @Override
+    public void dismiss() {
+        dismiss(null, false);
+    }
+
+    private void dismiss(DialogInputQuantityV2ResultDTO result, boolean shouldCloseLu) {
+        super.dismiss();
+        if (this.mOnComplete != null) {
+            if(result == null) {
+                mOnAbort.run();
+            } else {
+                this.mOnComplete.run(result, shouldCloseLu);
+            }
+        }
+    }
+
     @Override
     public void onStart() {
         super.onStart();
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/DialogScanArtView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java
index 6938c66d..8058efc9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java
@@ -1,24 +1,25 @@
 package it.integry.integrywmsnative.view.dialogs.scan_art;
 
+import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.annimon.stream.Stream;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.jetbrains.annotations.NotNull;
 
+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.expansion.BaseDialogFragment;
@@ -37,6 +38,8 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
     @Inject
     DialogScanArtViewModel mViewModel;
 
+    private Context mContext;
+
     private final boolean mForceOnlyUL;
 
     private DialogScanArtBinding mBindings;
@@ -53,44 +56,57 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
 
     private DialogScanArtView(boolean forceOnlyUL, RunnableArgssss<DialogConsts.Results, MtbAart, Ean128Model, MtbColr> onItemChoosed, RunnableArgs<MtbDepoPosizione> onMagazzinoAutomaticoPickingRequest) {
         super();
+
         mForceOnlyUL = forceOnlyUL;
         onPickingCompleted = onItemChoosed;
         this.onMagazzinoAutomaticoPickingRequest = onMagazzinoAutomaticoPickingRequest;
-    }
 
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        this.initBarcode();
-
-        mBindings = DialogScanArtBinding.inflate(inflater, container, false);
-        mBindings.setLifecycleOwner(this);
 
         MainApplication.appComponent
                 .dialogScanArtComponent()
                 .create()
                 .inject(this);
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        this.initBarcode();
+
+        mBindings = DialogScanArtBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
 
         this.mViewModel
                 .setForceOnlyUL(mForceOnlyUL)
                 .setListener(this);
 
-        getDialog().setCanceledOnTouchOutside(false);
-        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        setCancelable(false);
 
-        mBindings.buttonNo.setOnClickListener(v -> {
-            onPickingCompleted.run(DialogConsts.Results.ABORT, null, null, null);
-            dismiss();
-        });
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .setNegativeButton(R.string.abort, (dialogInterfact, i) -> {
+                    onPickingCompleted.run(DialogConsts.Results.ABORT, null, null, null);
+                })
+                .create();
 
-        return mBindings.getRoot();
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+
+        return alertDialog;
+    }
+
+    @Override
+    public void dismiss() {
+        if (getDialog() != null) getDialog().dismiss();
     }
 
 
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
         BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
-        BarcodeManager.enable();
         super.onDismiss(dialog);
     }
 
@@ -99,7 +115,6 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
         mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
                 .setOnScanSuccessful(onScanSuccessfull)
                 .setOnScanFailed(this::onError));
-        BarcodeManager.enable();
         setBarcodeListener(true);
     }
 
@@ -112,9 +127,9 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
             var filteredMtbColrList = mtbColrList;
 
             if (mtbAart != null && filteredMtbColrList != null) {
-                filteredMtbColrList = Stream.of(filteredMtbColrList)
+                filteredMtbColrList = filteredMtbColrList.stream()
                         .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()))
-                        .toList();
+                        .collect(Collectors.toList());
             }
 
             if (filteredMtbColrList != null && filteredMtbColrList.size() > 1) {
@@ -140,11 +155,4 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
             dismiss();
         });
     };
-
-
-    @Override
-    public void onError(Exception ex) {
-        super.onError(ex);
-        BarcodeManager.enable();
-    }
 }
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/DialogScanOrCreateLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java
index ffd5aae7..15ac4692 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java
@@ -35,7 +35,7 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
     DialogScanOrCreateLUViewModel mViewModel;
 
     private DialogScanOrCreateLuBinding mBindings;
-    private int mBarcodeScannerIstanceID;
+    private int mBarcodeScannerInstanceID;
 
     private final RunnableArgss<MtbColt, Boolean> mOnComplete;
     private MtbColt openedMtbColt;
@@ -109,15 +109,22 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
                 .setView(mBindings.getRoot())
                 .setCancelable(isCancelable())
                 .create();
-        alertDialog.setCanceledOnTouchOutside(false);
+
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
         alertDialog.setOnShowListener(this);
+        alertDialog.setOnDismissListener(this);
+
         return alertDialog;
     }
 
+    @Override
+    public void dismiss() {
+        if(getDialog() != null) getDialog().dismiss();
+    }
+
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
-        BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
-        BarcodeManager.enable();
+        BarcodeManager.removeCallback(mBarcodeScannerInstanceID);
         if (openedMtbColt == null) {
             mOnComplete.run(null, false);
         }
@@ -125,8 +132,10 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
     }
 
 
+
+
     private void initBarcode() {
-        mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+        mBarcodeScannerInstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
                 .setOnScanSuccessful(onScanSuccessfull)
                 .setOnScanFailed(this::onError));
         BarcodeManager.enable();
@@ -165,6 +174,7 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
     public void onLUOpened(MtbColt mtbColt, boolean created) {
         this.openedMtbColt = mtbColt;
         mOnComplete.run(mtbColt, created);
+
         dismiss();
     }
 
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..7ad43325 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
@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.view.dialogs.scan_or_create_lu;
 
 import com.annimon.stream.Stream;
 
+import javax.inject.Inject;
+
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.exception.AlreadyAttachedDocumentToLUException;
@@ -40,6 +42,7 @@ public class DialogScanOrCreateLUViewModel {
 
     private Listener mListener;
 
+    @Inject
     public DialogScanOrCreateLUViewModel(PosizioniRESTConsumer mPosizioniRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, ColliLavorazioneRESTConsumer mColliLavorazioneRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
         this.mPosizioniRESTConsumer = mPosizioniRESTConsumer;
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
@@ -95,7 +98,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 +127,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 +181,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/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java
index a6fa284e..2d075187 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java
@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.view.dialogs.yes_no;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -39,7 +38,7 @@ public class DialogYesNoView extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        var binding = DialogYesNoBinding.inflate(LayoutInflater.from(requireContext()));
+        var binding = DialogYesNoBinding.inflate(getLayoutInflater());
         binding.executePendingBindings();
 
         if (UtilityString.isNullOrEmpty(title)) {
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_dashboard_verifica_giacenze.xml b/app/src/main/res/drawable/ic_dashboard_verifica_giacenze.xml
new file mode 100644
index 00000000..0a23e65c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dashboard_verifica_giacenze.xml
@@ -0,0 +1,109 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="512dp" android:viewportHeight="425.2" android:viewportWidth="425.2" android:width="512dp">
+      
+    <path android:fillColor="#ededed" android:pathData="M98.2,388.1h235c15.7,0 33,-26.7 33,-26.7 52.1,-68.7 50.6,-45.3 0.1,-114.5 0,0 -17.4,-25.7 -33.1,-25.7H97.2c-15.7,0 -28.3,12.7 -28.3,28.3 0,0 0,109.3 0,109.3 0,16.2 13.1,29.3 29.3,29.3Z"/>
+      
+    <group>
+            
+        <clip-path android:pathData="M98.2,388.1h235c15.7,0 33,-26.7 33,-26.7 52.1,-68.7 50.6,-45.3 0.1,-114.5 0,0 -17.4,-25.7 -33.1,-25.7H97.2c-15.7,0 -28.3,12.7 -28.3,28.3 0,0 0,109.3 0,109.3 0,16.2 13.1,29.3 29.3,29.3Z"/>
+            
+        <path android:fillColor="#fff" android:pathData="M374.8,304.6c0,-16 -24.4,-16 -24.5,0 0,16 24.4,16 24.5,0Z"/>
+          
+    </group>
+      
+    <path android:fillColor="#505262" android:pathData="M317.1,251L317.2,251A5.7,5.7 0,0 1,322.9 256.7L322.9,343.5A5.7,5.7 0,0 1,317.2 349.2L317.1,349.2A5.7,5.7 0,0 1,311.4 343.5L311.4,256.7A5.7,5.7 0,0 1,317.1 251z"/>
+      
+    <path android:fillColor="#dddfdf" android:pathData="M70.4,367.9c3.8,11.7 14.9,20.2 27.9,20.2h235c10.6,0 22,-12.3 28.2,-20.2H70.4Z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M298.7,251L298.8,251A5.7,5.7 0,0 1,304.5 256.7L304.5,323.2A5.7,5.7 0,0 1,298.8 328.9L298.7,328.9A5.7,5.7 0,0 1,293 323.2L293,256.7A5.7,5.7 0,0 1,298.7 251z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M281.8,251L281.9,251A5.7,5.7 0,0 1,287.6 256.7L287.6,323.2A5.7,5.7 0,0 1,281.9 328.9L281.8,328.9A5.7,5.7 0,0 1,276.1 323.2L276.1,256.7A5.7,5.7 0,0 1,281.8 251z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M267.2,251.1L267.3,251.1A5.7,5.7 0,0 1,273 256.8L273,323.3A5.7,5.7 0,0 1,267.3 329L267.2,329A5.7,5.7 0,0 1,261.5 323.3L261.5,256.8A5.7,5.7 0,0 1,267.2 251.1z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M237.4,251L237.5,251A5.7,5.7 0,0 1,243.2 256.7L243.2,323.2A5.7,5.7 0,0 1,237.5 328.9L237.4,328.9A5.7,5.7 0,0 1,231.7 323.2L231.7,256.7A5.7,5.7 0,0 1,237.4 251z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M222.2,251.1L222.3,251.1A5.7,5.7 0,0 1,228 256.8L228,323.3A5.7,5.7 0,0 1,222.3 329L222.2,329A5.7,5.7 0,0 1,216.5 323.3L216.5,256.8A5.7,5.7 0,0 1,222.2 251.1z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M197.5,251L197.6,251A5.7,5.7 0,0 1,203.3 256.7L203.3,323.2A5.7,5.7 0,0 1,197.6 328.9L197.5,328.9A5.7,5.7 0,0 1,191.8 323.2L191.8,256.7A5.7,5.7 0,0 1,197.5 251z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M281.3,343.2a8.7,6.1 0,1 0,17.4 0a8.7,6.1 0,1 0,-17.4 0z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M255.8,343.8a8.7,6.1 0,1 0,17.4 0a8.7,6.1 0,1 0,-17.4 0z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M230.4,343.8a8.7,6.1 0,1 0,17.4 0a8.7,6.1 0,1 0,-17.4 0z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M205.4,343.8a8.7,6.1 0,1 0,17.4 0a8.7,6.1 0,1 0,-17.4 0z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M179.3,343.8a8.7,6.1 0,1 0,17.4 0a8.7,6.1 0,1 0,-17.4 0z"/>
+      
+    <path android:fillColor="#dddfdf" android:pathData="M69.2,340.4l67.1,38.9c14,8.1 31.9,3.3 40,-10.7l117.8,-203.4c7.8,-13.5 -6.6,-41.9 -6.6,-41.9 -33.2,-79.5 -13.7,-66.5 -98.9,-57.4 0,0 -16.8,1.2 -28.8,7.2 -4.3,2.2 -89,243.8 -91.1,247.4l0.3,19.8Z"/>
+      
+    <group>
+            
+        <clip-path android:pathData="M69.2,340.4l67.1,38.9c14,8.1 31.9,3.3 40,-10.7l117.8,-203.4c7.8,-13.5 -6.6,-41.9 -6.6,-41.9 -33.2,-79.5 -13.7,-66.5 -98.9,-57.4 0,0 -16.8,1.2 -28.8,7.2 -4.3,2.2 -89,243.8 -91.1,247.4l0.3,19.8Z"/>
+            
+        <path android:fillColor="#dddfdf" android:pathData="M242.9,87.5c-13.9,-8 -26.1,13.1 -12.3,21.2 13.9,8 26.1,-13.1 12.3,-21.2Z"/>
+          
+    </group>
+      
+    <path android:fillColor="#ededed" android:pathData="M168.1,348.5l117.8,-203.4c7.8,-13.5 -6.6,-41.9 -6.6,-41.9 -33.3,-79.5 -13.8,-66.5 -99,-57.5 0,0 -31,2.2 -38.8,15.7 0,0 -118.3,204.2 -118.3,204.2 -7.8,13.5 -3.2,30.9 10.3,38.7 0,0 94.5,54.8 94.5,54.8 14,8.1 31.9,3.3 40,-10.7Z"/>
+      
+    <group>
+            
+        <clip-path android:pathData="M168.1,348.5l117.8,-203.4c7.8,-13.5 -6.6,-41.9 -6.6,-41.9 -33.3,-79.5 -13.8,-66.5 -99,-57.5 0,0 -31,2.2 -38.8,15.7 0,0 -118.3,204.2 -118.3,204.2 -7.8,13.5 -3.2,30.9 10.3,38.7 0,0 94.5,54.8 94.5,54.8 14,8.1 31.9,3.3 40,-10.7Z"/>
+            
+        <path android:fillColor="#fff" android:pathData="M234.6,67.3c-13.9,-8 -26.1,13.1 -12.3,21.2 13.9,8 26.1,-13.1 12.3,-21.2Z"/>
+          
+    </group>
+      
+    <path android:fillColor="#505262" android:pathData="M159.27,90.45L159.32,90.36A5.7,5.7 75.1,0 1,167.11 88.29L242.2,131.82A5.7,5.7 75.1,0 1,244.28 139.61L244.23,139.7A5.7,5.7 75.1,0 1,236.44 141.77L161.34,98.24A5.7,5.7 75.1,0 1,159.27 90.45z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M150.02,106.3L150.07,106.22A5.7,5.7 75.1,0 1,157.86 104.14L215.4,137.49A5.7,5.7 75.1,0 1,217.47 145.28L217.42,145.37A5.7,5.7 75.1,0 1,209.63 147.44L152.1,114.09A5.7,5.7 75.1,0 1,150.02 106.3z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M141.49,120.88L141.54,120.79A5.7,5.7 75.1,0 1,149.33 118.72L206.86,152.07A5.7,5.7 75.1,0 1,208.94 159.86L208.89,159.95A5.7,5.7 75.1,0 1,201.1 162.02L143.56,128.67A5.7,5.7 75.1,0 1,141.49 120.88z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M134.37,133.58L134.42,133.49A5.7,5.7 75.1,0 1,142.21 131.42L199.74,164.77A5.7,5.7 75.1,0 1,201.81 172.56L201.76,172.64A5.7,5.7 75.1,0 1,193.97 174.72L136.44,141.37A5.7,5.7 75.1,0 1,134.37 133.58z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M119.38,159.24L119.43,159.16A5.7,5.7 75.1,0 1,127.22 157.08L184.75,190.43A5.7,5.7 75.1,0 1,186.82 198.22L186.77,198.31A5.7,5.7 75.1,0 1,178.98 200.38L121.45,167.03A5.7,5.7 75.1,0 1,119.38 159.24z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M111.69,172.44L111.74,172.35A5.7,5.7 75.1,0 1,119.53 170.28L177.06,203.63A5.7,5.7 75.1,0 1,179.13 211.42L179.08,211.51A5.7,5.7 75.1,0 1,171.29 213.58L113.76,180.23A5.7,5.7 75.1,0 1,111.69 172.44z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M99.3,193.75L99.35,193.66A5.7,5.7 75.1,0 1,107.14 191.59L164.67,224.94A5.7,5.7 75.1,0 1,166.74 232.73L166.69,232.82A5.7,5.7 75.1,0 1,158.9 234.89L101.37,201.54A5.7,5.7 75.1,0 1,99.3 193.75z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M221.1,167.56a8.7,6.1 120.1,1 0,8.73 -15.05a8.7,6.1 120.1,1 0,-8.73 15.05z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M208.86,189.95a8.7,6.1 120.1,1 0,8.73 -15.05a8.7,6.1 120.1,1 0,-8.73 15.05z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M196.13,211.97a8.7,6.1 120.1,1 0,8.73 -15.05a8.7,6.1 120.1,1 0,-8.73 15.05z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M183.59,233.51a8.7,6.1 120.1,1 0,8.73 -15.05a8.7,6.1 120.1,1 0,-8.73 15.05z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M170.53,256.09a8.7,6.1 120.1,1 0,8.73 -15.05a8.7,6.1 120.1,1 0,-8.73 15.05z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M86.66,215.77L86.71,215.68A5.7,5.7 75.1,0 1,94.5 213.61L152.03,246.96A5.7,5.7 75.1,0 1,154.11 254.75L154.06,254.84A5.7,5.7 75.1,0 1,146.27 256.91L88.73,223.56A5.7,5.7 75.1,0 1,86.66 215.77z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M77.25,232.08L77.3,231.99A5.7,5.7 75.1,0 1,85.09 229.92L142.62,263.27A5.7,5.7 75.1,0 1,144.69 271.06L144.64,271.14A5.7,5.7 75.1,0 1,136.85 273.22L79.32,239.87A5.7,5.7 75.1,0 1,77.25 232.08z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M68.88,246.23L68.93,246.14A5.7,5.7 75.1,0 1,76.72 244.07L134.26,277.42A5.7,5.7 75.1,0 1,136.33 285.21L136.28,285.3A5.7,5.7 75.1,0 1,128.49 287.37L70.96,254.02A5.7,5.7 75.1,0 1,68.88 246.23z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M56.12,267.75L56.17,267.67A5.7,5.7 75.1,0 1,63.96 265.59L139.49,309.38A5.7,5.7 75.1,0 1,141.56 317.17L141.51,317.25A5.7,5.7 75.1,0 1,133.72 319.33L58.19,275.54A5.7,5.7 75.1,0 1,56.12 267.75z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M159.35,278.86a8.7,6.1 120.1,1 0,8.73 -15.05a8.7,6.1 120.1,1 0,-8.73 15.05z"/>
+      
+    <path android:fillColor="#505262" android:pathData="M147.17,301.6a8.7,6.1 120.1,1 0,8.73 -15.05a8.7,6.1 120.1,1 0,-8.73 15.05z"/>
+      
+    <path android:fillColor="#676768" android:pathData="M304.5,281.2c-4.1,4.6 -10.2,9.5 -15.4,13.2s-0.7,1.3 -0.7,1.4c-42,27.7 -100.5,9.4 -120.1,-36.5 -4,-9.4 -5.7,-19.4 -6.8,-29.6 0.7,-5 0.3,-10.6 1.1,-15.6 8.3,-53.2 66.7,-83.4 115.4,-60.6 48.3,22.7 62.1,87.2 26.6,127.6ZM242,159c-49.2,0.3 -81.4,52.8 -60.5,97.3 21.4,45.4 83.1,52.7 114.7,13.6 36.5,-45.1 3.5,-111.3 -54.2,-111Z"/>
+      
+    <path android:fillColor="#f7991c" android:pathData="M369.3,389.5l-6.4,-0.4c-1.3,-1.1 -3.1,-1.4 -4.6,-2.2 -4.9,-2.7 -7.8,-7.7 -11.4,-11.7l28.8,-25.6c3.3,3.9 7.7,7.5 9.8,12.3 5.6,12.6 -3.2,25.9 -16.2,27.7Z"/>
+      
+    <path android:fillColor="#f7991c" android:pathData="M364.6,336.8l-29.3,25.1c-14.1,-16 -28.2,-32 -42.2,-48.1 -1.5,-3 2.2,-5.4 4.2,-7.3 5.2,-4.8 11.3,-10.5 16.6,-15 0.1,0 0.8,0 1.2,-0.4 2.1,-1.7 4.6,-5.3 7.3,-2.9 14.2,16.1 28.2,32.3 42.2,48.6Z"/>
+      
+    <path android:fillColor="#676768" android:pathData="M375.7,349.5l-28.8,25.6c-3.9,-4.4 -7.7,-8.8 -11.5,-13.2l29.3,-25.1c3.7,4.3 7.4,8.4 11.1,12.7Z"/>
+      
+    <path android:fillColor="#545454" android:pathData="M304.5,281.2l9.4,10.3c-5.3,4.5 -11.4,10.1 -16.6,15l-8.9,-10.7c0,0 0.2,-1 0.7,-1.4 5.2,-3.7 11.3,-8.6 15.4,-13.2Z"/>
+      
+    <path android:fillAlpha="0.8" android:fillColor="#70d0fd" android:pathData="M242,159c57.7,-0.3 90.7,65.8 54.2,111 -31.6,39 -93.3,31.8 -114.7,-13.6 -20.9,-44.5 11.3,-97.1 60.5,-97.3ZM214.3,188.8c-3.3,0.2 -7.7,5.5 -9.7,8.1 -11.7,14.7 -13.4,34.3 -5.9,51.4 2.1,4.8 9.2,17.9 15.5,11.4 4.7,-4.8 -2.3,-10.3 -4.7,-14.8 -7.6,-14.8 -5.3,-31.4 5.7,-43.7 1.5,-1.7 4.2,-2.8 4.7,-5.5s-2,-7.2 -5.6,-6.9Z" android:strokeAlpha="0.8"/>
+      
+    <path android:fillColor="#e2e9f7" android:pathData="M214.3,188.8c3.6,-0.2 6.3,3.4 5.6,6.9s-3.2,3.7 -4.7,5.5c-11,12.3 -13.3,28.9 -5.7,43.7 2.4,4.6 9.4,10 4.7,14.8 -6.3,6.5 -13.5,-6.6 -15.5,-11.4 -7.5,-17.1 -5.8,-36.7 5.9,-51.4s6.4,-7.9 9.7,-8.1Z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_drawer_verifica_giacenze.xml b/app/src/main/res/drawable/ic_drawer_verifica_giacenze.xml
new file mode 100644
index 00000000..9384e402
--- /dev/null
+++ b/app/src/main/res/drawable/ic_drawer_verifica_giacenze.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="48dp" android:viewportHeight="512" android:viewportWidth="512" android:width="48dp">
+      
+    <path android:fillColor="#010101" android:pathData="M28.9,99.2c-10.7,0 -19.3,8.6 -19.3,19.3v270.2c0,10.7 8.6,19.3 19.3,19.3s19.3,-8.6 19.3,-19.3V118.5c0,-10.7 -8.6,-19.3 -19.3,-19.3ZM86.8,99.2c-10.7,0 -19.3,8.6 -19.3,19.3v270.2c0,10.7 8.6,19.3 19.3,19.3h38.6c10.7,0 19.3,-8.6 19.3,-19.3V118.5c0,-10.7 -8.6,-19.3 -19.3,-19.3h-38.6ZM183.3,99.2c-10.7,0 -19.3,8.6 -19.3,19.3v270.2c0,10.7 8.6,19.3 19.3,19.3s19.3,-8.6 19.3,-19.3V118.5c0,-10.7 -8.6,-19.3 -19.3,-19.3ZM241.2,99.2c-10.7,0 -19.3,8.6 -19.3,19.3v270.2c0,10.7 8.6,19.3 19.3,19.3h19.3c10.7,0 19.3,-8.6 19.3,-19.3V118.5c0,-10.7 -8.6,-19.3 -19.3,-19.3h-19.3ZM318.4,99.2c-10.7,0 -19.3,8.6 -19.3,19.3v270.2c0,10.7 8.6,19.3 19.3,19.3s19.3,-8.6 19.3,-19.3V118.5c0,-10.7 -8.6,-19.3 -19.3,-19.3ZM376.3,99.2c-10.7,0 -19.3,8.6 -19.3,19.3v270.2c0,10.7 8.6,19.3 19.3,19.3s19.3,-8.6 19.3,-19.3V118.5c0,-10.7 -8.6,-19.3 -19.3,-19.3Z"/>
+      
+    <path android:fillColor="#010101" android:pathData="M500.7,393l-59.2,-59.2c34.7,-42.5 25.7,-103.8 -16.8,-138.6 -42.5,-34.7 -105,-28.4 -139.8,14 -34.7,42.5 -28.4,105 14,139.8 36.6,29.9 87.9,32.7 124.5,2.8l59.2,59.2c3.9,3.8 11.5,0.9 15.3,-3 3.7,-3.8 6.5,-11.1 2.8,-15ZM361.9,345.6c-40.6,0 -73.6,-32.9 -73.6,-73.6s32.9,-73.6 73.6,-73.6 73.6,32.9 73.6,73.6c0,40.6 -33,73.5 -73.6,73.6Z" android:strokeColor="#fff" android:strokeWidth="4"/>
+      
+    <path android:fillColor="#fff" android:pathData="M362.7,271.4m-72.8,0a72.8,72.8 0,1 1,145.6 0a72.8,72.8 0,1 1,-145.6 0"/>
+    
+</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__item_edit_view.xml b/app/src/main/res/layout/bottom_sheet__item_edit_view.xml
index 96e92a60..c77bfb53 100644
--- a/app/src/main/res/layout/bottom_sheet__item_edit_view.xml
+++ b/app/src/main/res/layout/bottom_sheet__item_edit_view.xml
@@ -51,7 +51,7 @@
                     android:maxLines="2"
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
-                    android:text="@{viewModel.currentItem.descrizioneArticolo}"
+                    android:text="@{viewModel.currentItem.descrizione}"
                     android:textColor="#444"
                     android:textStyle="bold"
                     tools:text="Descrizione articolo" />
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..1e38e785 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
@@ -140,7 +140,6 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.card.MaterialCardView
-            android:id="@+id/new_card"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -178,7 +177,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 +186,7 @@
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{GestioneToTextConverter.convert(mtbColr.gestioneEnum)}"
+                        android:text="@{mtbColr.gestioneRifEnum != null ? GestioneToTextConverter.convert(mtbColr.gestioneRifEnum) : &quot;&quot;}"
                         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_ask_deposito.xml b/app/src/main/res/layout/dialog_ask_deposito.xml
new file mode 100644
index 00000000..c10ed1d8
--- /dev/null
+++ b/app/src/main/res/layout/dialog_ask_deposito.xml
@@ -0,0 +1,69 @@
+<?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/deposit" />
+
+
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:orientation="horizontal">
+
+
+                <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
+                    style="@style/AppTheme.NewMaterial.Text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="12dp"
+                    android:gravity="center_horizontal"
+                    android:text="@string/scan_deposit"
+                    android:textSize="16sp" />
+            </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_ask_livello_of_position.xml b/app/src/main/res/layout/dialog_ask_livello_of_position.xml
deleted file mode 100644
index f1e13a5d..00000000
--- a/app/src/main/res/layout/dialog_ask_livello_of_position.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layout xmlns:app="http://schemas.android.com/apk/res-auto">
-    <data>
-        <import type="android.text.Html" />
-        <import type="it.integry.integrywmsnative.R" />
-        <variable
-            name="mContext"
-            type="android.content.Context" />
-    </data>
-
-    <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="12dp"
-        app:cardElevation="0dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/light_blue_300"
-                    android:gravity="center_horizontal">
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/ic_error_white_24dp"
-                        android:layout_margin="24dp"/>
-
-                </RelativeLayout>
-
-
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingTop="24dp"
-                    android:paddingLeft="24dp"
-                    android:paddingRight="24dp">
-
-                    <TextView
-                        android:id="@+id/title_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/TextViewMaterial.Dialog.HeadlineText"
-                        android:text="@string/placement"
-                        android:gravity="center_horizontal"/>
-
-
-                    <include
-                        layout="@layout/dialog_ask_position_of_lu__page2" />
-
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-
-    </androidx.cardview.widget.CardView>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ask_livello_posizione.xml b/app/src/main/res/layout/dialog_ask_livello_posizione.xml
new file mode 100644
index 00000000..3f5c99ec
--- /dev/null
+++ b/app/src/main/res/layout/dialog_ask_livello_posizione.xml
@@ -0,0 +1,58 @@
+<?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/placement" />
+
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/level_number_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/level_number"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/level"
+                android:inputType="number"
+                style="@style/TextInputEditText.OutlinePrimary"/>
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+</androidx.cardview.widget.CardView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ask_position_of_lu.xml b/app/src/main/res/layout/dialog_ask_position_of_lu.xml
index 7bb7f200..6900bba1 100644
--- a/app/src/main/res/layout/dialog_ask_position_of_lu.xml
+++ b/app/src/main/res/layout/dialog_ask_position_of_lu.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <layout xmlns:app="http://schemas.android.com/apk/res-auto">
-    <data>
-        <import type="android.text.Html" />
-        <import type="it.integry.integrywmsnative.R" />
-    </data>
-
 
     <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical" android:layout_width="match_parent"
@@ -50,5 +44,4 @@
 
         </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.cardview.widget.CardView>
-
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_extra_info.xml b/app/src/main/res/layout/dialog_extra_info.xml
new file mode 100644
index 00000000..57fe6c15
--- /dev/null
+++ b/app/src/main/res/layout/dialog_extra_info.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="0dp">
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="16dp"
+            android:paddingVertical="16dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_error_white_24dp"
+                app:tint="?colorPrimary" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title_text"
+                style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_marginBottom="16dp"
+                android:text="@string/informations" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/description_text"
+                style="@style/TextAppearance.Material3.BodyLarge"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:text="Barcode deposito" />
+
+            <ImageView
+                android:id="@+id/barcode_current_deposit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"/>
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+    </androidx.cardview.widget.CardView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_scan_art.xml b/app/src/main/res/layout/dialog_scan_art.xml
index 0816d677..ca6e4f2e 100644
--- a/app/src/main/res/layout/dialog_scan_art.xml
+++ b/app/src/main/res/layout/dialog_scan_art.xml
@@ -11,72 +11,54 @@
         app:cardCornerRadius="16dp"
         app:cardElevation="0dp">
 
+
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingStart="24dp"
+            android:paddingTop="24dp"
+            android:paddingEnd="24dp"
+            android:paddingBottom="12dp">
 
-
-            <androidx.appcompat.widget.LinearLayoutCompat
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title_text"
+                style="@style/TextViewMaterial.Dialog.HeadlineText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingStart="24dp"
-                android:paddingTop="24dp"
-                android:paddingEnd="24dp"
-                android:paddingBottom="12dp">
+                android:gravity="center_horizontal"
+                android:text="@string/extra_item" />
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="24dp"
+                android:orientation="horizontal">
+
+
+                <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:id="@+id/title_text"
-                    style="@style/TextViewMaterial.Dialog.HeadlineText"
-                    android:layout_width="match_parent"
+                    style="@style/AppTheme.NewMaterial.Text"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="12dp"
                     android:gravity="center_horizontal"
-                    android:text="@string/extra_item" />
-
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="24dp"
-                    android:orientation="horizontal">
-
-
-                    <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
-                        style="@style/AppTheme.NewMaterial.Text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginEnd="12dp"
-                        android:gravity="center_horizontal"
-                        android:text="@string/scan_item"
-                        android:textSize="16sp" />
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/button_no"
-                    style="@style/Button.DangerOutline"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="16dp"
-                    android:text="@string/abort"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:strokeColor="@color/red_400" />
-
+                    android:text="@string/scan_item"
+                    android:textSize="16sp" />
             </androidx.appcompat.widget.LinearLayoutCompat>
 
         </androidx.appcompat.widget.LinearLayoutCompat>
+
     </androidx.cardview.widget.CardView>
 
 
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_elenco_inventario_list_single_item.xml b/app/src/main/res/layout/fragment_elenco_inventario_list_single_item.xml
index 66ecb739..5c026ed7 100644
--- a/app/src/main/res/layout/fragment_elenco_inventario_list_single_item.xml
+++ b/app/src/main/res/layout/fragment_elenco_inventario_list_single_item.xml
@@ -9,7 +9,7 @@
 
         <variable
             name="item"
-            type="it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO" />
+            type="it.integry.integrywmsnative.core.data_store.db.entity.InventarioEntity" />
 
     </data>
 
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/fragment_verifica_giacenze.xml b/app/src/main/res/layout/fragment_verifica_giacenze.xml
new file mode 100644
index 00000000..fb29e68b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_verifica_giacenze.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+
+    <data>
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.gest.pv_verifica_giacenze.VerificaGiacenzeFragment" />
+
+        <variable
+            name="viewModel"
+            type="it.integry.integrywmsnative.gest.pv_verifica_giacenze.VerificaGiacenzeViewModel" />
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/empty_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha="0.15"
+            android:visibility="gone">
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_empty_top"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.2" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_empty_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.15" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_empty_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.85" />
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
+                app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
+                app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="72dp"
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/ic_black_barcode_scanner" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:text="@string/scan_item" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/verifica_giacenze_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:paddingBottom="72dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="?attr/floatingActionButtonPrimaryStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="16dp"
+            app:singleClick="@{() -> view.saveAndClose()}"
+            app:srcCompat="@drawable/ic_round_check_24"
+            app:visibilityWhenNotNull="@{viewModel.currentVerifica}" />
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</layout>
\ No newline at end of file
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/lista_verifica_giacenze_picked_item_list_model.xml b/app/src/main/res/layout/lista_verifica_giacenze_picked_item_list_model.xml
new file mode 100644
index 00000000..022b51eb
--- /dev/null
+++ b/app/src/main/res/layout/lista_verifica_giacenze_picked_item_list_model.xml
@@ -0,0 +1,110 @@
+<?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="android.view.View" />
+        <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+        <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+        <import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
+
+        <variable
+            name="item"
+            type="it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeRowEntity" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true"
+        android:padding="8dp">
+
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/cod_mart"
+            style="@style/AppTheme.NewMaterial.Text.Small"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@{item.codMart}"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toStartOf="@id/qta_box"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="COD MART" />
+
+<!--        <androidx.appcompat.widget.AppCompatTextView-->
+<!--            android:id="@+id/peso"-->
+<!--            style="@style/AppTheme.NewMaterial.Text.Small"-->
+<!--            android:layout_width="0dp"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:background="@drawable/badge_round_corner"-->
+<!--            android:backgroundTint="@color/orange_600"-->
+<!--            android:paddingStart="6dp"-->
+<!--            android:paddingEnd="6dp"-->
+<!--            android:text="@{UtilityNumber.decimalToString(item.qta) }"-->
+<!--            android:textColor="@android:color/white"-->
+<!--            android:textSize="14sp"-->
+<!--            android:textStyle="bold"-->
+<!--            app:layout_constraintEnd_toStartOf="@id/qta_box"-->
+<!--            app:layout_constraintTop_toTopOf="parent"-->
+<!--            tools:text="PESO KG" />-->
+
+        <TextView
+            android:id="@+id/descrizione"
+            style="@style/AppTheme.NewMaterial.Text.Small"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:text="@{item.getDescrizione()}"
+            android:textColor="@android:color/black"
+            android:textSize="16sp"
+            android:layout_marginEnd="8dp"
+            app:layout_constraintEnd_toStartOf="@id/qta_box"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cod_mart"
+            tools:text="Descrizione lunga articolo" />
+
+
+        <TextView
+            style="@style/AppTheme.NewMaterial.Text.Small"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{`Lotto: ` + item.getPartitaMag()}"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/descrizione"
+            app:visibilityWhenNotNull="@{item.partitaMag}"
+            tools:text="Lotto: ABCDE" />
+
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/qta_box"
+            style="@style/AppTheme.NewMaterial.Text.Small"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="@drawable/badge_round_corner"
+            android:backgroundTint="?colorPrimary"
+            android:gravity="center"
+            android:paddingLeft="6dp"
+            android:paddingTop="2dp"
+            android:paddingRight="6dp"
+            android:paddingBottom="2dp"
+            android:textAllCaps="true"
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:text="@{UtilityNumber.decimalToString(item.qta)}"
+            tools:text="280.45\nCONF" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</layout>
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..ffc77c6a 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>
@@ -42,6 +47,7 @@
 
     <string name="permission_request_message">Questi permessi sono necessari al funzionamento dell\'app</string>
     <string name="picking_not_available">Picking non disponibile</string>
+    <string name="scan_deposit">Scansiona il codice a barre di un <b>deposito</b></string>
     <string name="scan_item">Scansiona il codice a barre di un <b>articolo</b></string>
     <string name="please_open_lu">Prima di procedere apri una <b>nuova UL</b></string>
     <string name="scan_lu_to_deposit">Scansiona il codice a barre di una <b>UL</b> per versarla</string>
@@ -87,6 +93,7 @@
 
     <!-- SETTINGS -->
     <string name="general_settings">Impostazioni</string>
+    <string name="informations">Informazioni</string>
 
     <plurals name="references">
         <item quantity="one">referenza</item>
@@ -147,7 +154,8 @@
     <string name="server_cod_azienda_not_valid"><![CDATA[Il codice azienda <b>%s</b> non è valido. Controllalo e riprova]]></string>
     <string name="server_not_reachable"><![CDATA[L\'host <b>%s</b> sulla porta <b>%d</b> non è al momento raggiungibile. Riprova più tardi]]></string>
     <string name="no_codmdep_available">Nessun deposito trovato per l\'utente corrente</string>
-    <string name="invalid_codmdep">Impossibile utilizzare unità logistiche di altri depositi</string>
+    <string name="invalid_codmdep_error_message">Codice deposito non valido</string>
+    <string name="invalid_codmdep_lu_error_message">Impossibile utilizzare unità logistiche di altri depositi</string>
     <string name="action_choose_profile_db">Seleziona un database</string>
 
     <string name="empty_rows_in_mtbcolt">Nessuna riga presente nell\'Unità Logistica</string>
@@ -185,6 +193,8 @@
     <string name="tare_pckg">Tara collo</string>
     <string name="tare_art">Tara articolo</string>
 
+    <string name="checking_updates">Controllo gli aggiornamenti</string>
+
     <string name="saving">Salvataggio</string>
     <string name="data_saved">Salvataggio completato</string>
     <string name="alert_print_completed_message">Stampa completata</string>
@@ -207,6 +217,7 @@
     <string name="settings_category">Impostazioni</string>
     <string name="check_box_preference_title">Check box</string>
     <string name="check_box_preference_summary">This is a regular preference</string>
+    <string name="confirm_anomalie"><![CDATA[Sono state riscontrate <b>%d</b> anomalie. Continuare?]]></string>
 
     <string name="alert_delete_UL">Stai per eliminare una UL. Confermi?</string>
     <string name="alert_delete_mtb_colr">Stai per eliminare una riga. Confermi?</string>
@@ -334,7 +345,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 +391,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>
@@ -402,6 +414,7 @@
     <string name="title_dynamic_agricoper">Personalizzazioni Agricoper</string>
     <string name="title_dynamicfeature">Titolo Modulo</string>
     <string name="doc_interni">Documenti interni</string>
+    <string name="verifica_giacenze_menu">Verifica giacenze</string>
     <string name="doc_interni_num_arts_doc"><![CDATA[#<b>%d</b> articoli]]></string>
     <string name="doc_interni_doc_header"><![CDATA[DL #<b>%d_%s</b>]]></string>
     <string name="dialog_doc_interni_choose_dtip_mgrp_pair_title">Seleziona estremi documento</string>
@@ -451,9 +464,11 @@
     <string name="action_print_shipping_SSCC">Stampa etichetta spedizione</string>
     <string name="action_print_production_SSCC">Stampa etichetta lavorazione</string>
     <string name="scanner_settings">Impostazioni scanner</string>
-    <string name="developer_settings">Svilupppo</string>
-    <string name="developer_settings_title">Esporta log</string>
-    <string name="developer_settings_summary">Esporta il log degli eventi</string>
+    <string name="developer_settings">Sviluppo</string>
+    <string name="developer_settings_export_log_title">Esporta log</string>
+    <string name="developer_settings_export_log_summary">Esporta il log degli eventi</string>
+    <string name="developer_settings_enable_beta_version_title">Aggiornamenti beta</string>
+    <string name="developer_settings_enable_beta_version_summary">Abilita aggiornamenti beta (fortemente sconsigliato)</string>
     <string name="scanner_settings_scanner_delay_title">Ritardo scansione</string>
     <string name="scanner_settings_scanner_delay_summary">Imposta un ritardo di lettura per la scansione</string>
     <string name="scanner_settings_trigger_scan_mode_title">Modalità scansione</string>
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index a9e9cd76..318884eb 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -20,4 +20,10 @@
 		<attr name="backgroundView" />
 		<attr name="parentView" />
 	</declare-styleable>
+
+
+	<declare-styleable name="ConfirmSwitchPreferenceCompat">
+		<attr name="confirmTitle" format="string" />
+		<attr name="confirmMessage" format="string" />
+	</declare-styleable>
 </resources>
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/config.xml b/app/src/main/res/values/config.xml
index f15a6039..2824ff81 100644
--- a/app/src/main/res/values/config.xml
+++ b/app/src/main/res/values/config.xml
@@ -39,8 +39,10 @@
     <item name="nav_pv_ordini_acquisto_trasmessi" type="id" />
     <item name="nav_prod_rientro_merce" type="id" />
     <item name="nav_prod_linee" type="id" />
+    <item name="nav_extra_info" type="id" />
     <item name="nav_settings" type="id" />
     <item name="nav_logout" type="id" />
     <item name="nav_pv_doc_interni" type="id" />
+    <item name="nav_pv_verifica_giacenze" type="id" />
 
 </resources>
\ No newline at end of file
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..75144049 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>
@@ -121,6 +125,7 @@
     <string name="dialog_message_additional_notes">Enter any additional notes in your logistics unit</string>
     <string name="logistic_unit">LU</string>
     <string name="general_settings">General settings</string>
+    <string name="informations">Info</string>
     <string name="action_close_ul">Close LU</string>
     <string name="already_read_articles">Submitted items</string>
     <string name="orders">Orders</string>
@@ -132,6 +137,7 @@
     <string name="prepared_by_text">Prepared by</string>
     <string name="customer_text">Customer</string>
     <string name="picking_not_available">Picking not available</string>
+    <string name="scan_deposit">Please scan a <b>deposit</b> barcode</string>
     <string name="scan_item">Please scan an <b>item</b> barcode</string>
     <string name="extra_item">Extra item</string>
     <string name="piece">Piece</string>
@@ -145,7 +151,8 @@
     <string name="server_cod_azienda_not_valid"><![CDATA[Code <b>%s</b> is not valid. Check and retry later]]></string>
     <string name="server_not_reachable"><![CDATA[The host <b>%s</b> on port <b>%d</b> is not reachable. Retry later]]></string>
     <string name="no_codmdep_available">No deposit available with current user</string>
-    <string name="invalid_codmdep">Unable to use logistics units from other depots</string>
+    <string name="invalid_codmdep_error_message">Not valid depo code</string>
+    <string name="invalid_codmdep_lu_error_message">Unable to use logistics units from other depots</string>
     <string name="action_choose_profile_db">Choose a database</string>
 
     <string name="empty_rows_in_mtbcolt">No rows found in LU</string>
@@ -185,6 +192,8 @@
     <string name="tare_art">Tare product</string>
     <string name="tare_pckg">Tare pckg</string>
 
+    <string name="checking_updates">Checking for updates</string>
+
     <string name="saving">Saving</string>
     <string name="data_saved">Data saved</string>
     <string name="alert_print_completed_message">Printing job completed</string>
@@ -207,6 +216,7 @@
     <string name="settings_category">Settings</string>
     <string name="check_box_preference_title">Check box</string>
     <string name="check_box_preference_summary">This is a regular preference</string>
+    <string name="confirm_anomalie"><![CDATA[<b>%d</b> anomalies were found. To continue?]]></string>
 
     <string name="alert_delete_UL">Are you sure you want to delete this UL? Please confirm</string>
     <string name="alert_delete_mtb_colr">Are you sure to delete? Please confirm</string>
@@ -338,7 +348,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 +396,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>
@@ -408,6 +419,7 @@
     <string name="title_dynamic_agricoper">Agricoper customizations</string>
     <string name="title_dynamicfeature">Module Title</string>
     <string name="doc_interni">Internal Docs</string>
+    <string name="verifica_giacenze_menu">Check stocks</string>
     <string name="doc_interni_num_arts_doc"><![CDATA[#<b>%d</b> items]]></string>
     <string name="doc_interni_doc_header"><![CDATA[DL #<b>%d_%s</b>]]></string>
     <string name="dialog_doc_interni_choose_dtip_mgrp_pair_title">Choose Document details</string>
@@ -458,8 +470,10 @@
     <string name="action_print_production_SSCC">Print production label</string>
     <string name="scanner_settings">Scanner settings</string>
     <string name="developer_settings">Developer settings</string>
-    <string name="developer_settings_title">Esporta log</string>
-    <string name="developer_settings_summary">Esporta il log degli eventi</string>
+    <string name="developer_settings_export_log_title">Export log</string>
+    <string name="developer_settings_export_log_summary">Export event log</string>
+    <string name="developer_settings_enable_beta_version_title">Beta updates</string>
+    <string name="developer_settings_enable_beta_version_summary">Enable beta updates (strongly discouraged)</string>
     <string name="scanner_settings_scanner_delay_title">Scan delay</string>
     <string name="scanner_settings_scanner_delay_summary">Set reading scanner delay</string>
     <string name="scanner_settings_trigger_scan_mode_title">Modalità scansione</string>
diff --git a/app/src/main/res/xml/app_preferences.xml b/app/src/main/res/xml/app_preferences.xml
index fbf785a3..689d8d58 100644
--- a/app/src/main/res/xml/app_preferences.xml
+++ b/app/src/main/res/xml/app_preferences.xml
@@ -67,10 +67,27 @@
         app:title="@string/developer_settings"
         app:iconSpaceReserved="false">
 
+        <it.integry.integrywmsnative.view.components.ConfirmSwitchPreferenceCompat
+            android:title="@string/developer_settings_enable_beta_version_title"
+            android:key="ENABLE_BETA"
+            android:summary="@string/developer_settings_enable_beta_version_summary"
+            app:iconSpaceReserved="false"
+            android:defaultValue="false"
+            app:confirmTitle="@string/developer_settings_enable_beta_version_title"
+            app:confirmMessage="Sei sicuro di voler abilitare gli aggiornamenti beta? Se accetti dovrai chiudere e riaprire l'app per scaricare l'aggiornamento."
+            />
+
         <Preference
-            android:title="@string/developer_settings_title"
+            android:title="Verifica aggiornamenti"
+            android:key="CHECK_UPDATES"
+            android:summary="Verifica la disponibilità di nuovi aggiornamenti"
+            app:iconSpaceReserved="false"
+            />
+
+        <Preference
+            android:title="@string/developer_settings_export_log_title"
             android:key="EXPORT_LOG"
-            android:summary="@string/developer_settings_summary"
+            android:summary="@string/developer_settings_export_log_summary"
             app:iconSpaceReserved="false"
             />
 
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/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/model/BarcodeSetting.java b/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/model/BarcodeSetting.java
index 90de83c6..84b6eb09 100644
--- a/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/model/BarcodeSetting.java
+++ b/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/model/BarcodeSetting.java
@@ -1,7 +1,6 @@
 package it.integry.barcode_base_android_library.model;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
 
 public class BarcodeSetting {
 
@@ -13,14 +12,13 @@ public class BarcodeSetting {
     public static final String P_TRIGGER_SCAN_DELAY = "TRIG_SCAN_DELAY";
 
 
-    public static CharSequence[] getTriggerScanModes() {
-        List<String> keys = new ArrayList<>();
-        keys.add(V_TRIGGER_SCAN_MODE_READ_ON_RELEASE);
-        keys.add(V_TRIGGER_SCAN_MODE_ONE_SHOT);
-//        keys.add(V_TRIGGER_SCAN_MODE_CONTINUOS);
-//        keys.add(V_TRIGGER_SCAN_MODE_READ_ON_SECOND_TRIGGER_PRESS);
-
-        return keys.toArray(new String[0]);
+    public static HashMap<String, CharSequence> getTriggerScanModes() {
+        return new HashMap<>() {{
+            put(V_TRIGGER_SCAN_MODE_READ_ON_RELEASE, "Read on release");
+            put(V_TRIGGER_SCAN_MODE_ONE_SHOT, "One shot");
+//            put(V_TRIGGER_SCAN_MODE_CONTINUOS, "Continuous");
+//            put(V_TRIGGER_SCAN_MODE_READ_ON_SECOND_TRIGGER_PRESS, "Read on second trigger press");
+        }};
     }
 
 }
diff --git a/ext_sources/ICONS/ic_dashboard_verifica_giacenze.svg b/ext_sources/ICONS/ic_dashboard_verifica_giacenze.svg
new file mode 100644
index 00000000..31bc47eb
--- /dev/null
+++ b/ext_sources/ICONS/ic_dashboard_verifica_giacenze.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Livello_1" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 425.2 425.2">
+  <!-- Generator: Adobe Illustrator 29.0.1, SVG Export Plug-In . SVG Version: 2.1.0 Build 192)  -->
+  <defs>
+    <style>
+      .st0 {
+        fill: #676768;
+      }
+
+      .st1 {
+        fill: #505262;
+      }
+
+      .st2 {
+        fill: #fff;
+      }
+
+      .st3 {
+        fill: #f7991c;
+      }
+
+      .st4 {
+        fill: #dddfdf;
+      }
+
+      .st5 {
+        fill: #70d0fd;
+        opacity: .8;
+      }
+
+      .st6 {
+        clip-path: url(#clippath-1);
+      }
+
+      .st7 {
+        fill: #545454;
+      }
+
+      .st8 {
+        clip-path: url(#clippath-2);
+      }
+
+      .st9 {
+        fill: #ededed;
+      }
+
+      .st10 {
+        clip-path: url(#clippath);
+      }
+
+      .st11 {
+        fill: #e2e9f7;
+      }
+    </style>
+    <clipPath id="clippath">
+      <path class="st9" d="M98.2,388.1h235c15.7,0,33-26.7,33-26.7,52.1-68.7,50.6-45.3.1-114.5,0,0-17.4-25.7-33.1-25.7H97.2c-15.7,0-28.3,12.7-28.3,28.3,0,0,0,109.3,0,109.3,0,16.2,13.1,29.3,29.3,29.3Z"/>
+    </clipPath>
+    <clipPath id="clippath-1">
+      <path class="st4" d="M69.2,340.4l67.1,38.9c14,8.1,31.9,3.3,40-10.7l117.8-203.4c7.8-13.5-6.6-41.9-6.6-41.9-33.2-79.5-13.7-66.5-98.9-57.4,0,0-16.8,1.2-28.8,7.2-4.3,2.2-89,243.8-91.1,247.4l.3,19.8Z"/>
+    </clipPath>
+    <clipPath id="clippath-2">
+      <path class="st9" d="M168.1,348.5l117.8-203.4c7.8-13.5-6.6-41.9-6.6-41.9-33.3-79.5-13.8-66.5-99-57.5,0,0-31,2.2-38.8,15.7,0,0-118.3,204.2-118.3,204.2-7.8,13.5-3.2,30.9,10.3,38.7,0,0,94.5,54.8,94.5,54.8,14,8.1,31.9,3.3,40-10.7Z"/>
+    </clipPath>
+  </defs>
+  <g>
+    <g>
+      <path class="st9" d="M98.2,388.1h235c15.7,0,33-26.7,33-26.7,52.1-68.7,50.6-45.3.1-114.5,0,0-17.4-25.7-33.1-25.7H97.2c-15.7,0-28.3,12.7-28.3,28.3,0,0,0,109.3,0,109.3,0,16.2,13.1,29.3,29.3,29.3Z"/>
+      <g class="st10">
+        <path class="st2" d="M374.8,304.6c0-16-24.4-16-24.5,0,0,16,24.4,16,24.5,0Z"/>
+      </g>
+    </g>
+    <rect class="st1" x="311.4" y="251" width="11.5" height="98.2" rx="5.7" ry="5.7"/>
+    <path class="st4" d="M70.4,367.9c3.8,11.7,14.9,20.2,27.9,20.2h235c10.6,0,22-12.3,28.2-20.2H70.4Z"/>
+    <rect class="st1" x="293" y="251" width="11.5" height="77.9" rx="5.7" ry="5.7"/>
+    <rect class="st1" x="276.1" y="251" width="11.5" height="77.9" rx="5.7" ry="5.7"/>
+    <rect class="st1" x="261.5" y="251.1" width="11.5" height="77.9" rx="5.7" ry="5.7"/>
+    <rect class="st1" x="231.7" y="251" width="11.5" height="77.9" rx="5.7" ry="5.7"/>
+    <rect class="st1" x="216.5" y="251.1" width="11.5" height="77.9" rx="5.7" ry="5.7"/>
+    <rect class="st1" x="191.8" y="251" width="11.5" height="77.9" rx="5.7" ry="5.7"/>
+    <ellipse class="st1" cx="290" cy="343.2" rx="8.7" ry="6.1"/>
+    <ellipse class="st1" cx="264.5" cy="343.8" rx="8.7" ry="6.1"/>
+    <ellipse class="st1" cx="239.1" cy="343.8" rx="8.7" ry="6.1"/>
+    <ellipse class="st1" cx="214.1" cy="343.8" rx="8.7" ry="6.1"/>
+    <ellipse class="st1" cx="188" cy="343.8" rx="8.7" ry="6.1"/>
+  </g>
+  <g>
+    <g>
+      <path class="st4" d="M69.2,340.4l67.1,38.9c14,8.1,31.9,3.3,40-10.7l117.8-203.4c7.8-13.5-6.6-41.9-6.6-41.9-33.2-79.5-13.7-66.5-98.9-57.4,0,0-16.8,1.2-28.8,7.2-4.3,2.2-89,243.8-91.1,247.4l.3,19.8Z"/>
+      <g class="st6">
+        <path class="st4" d="M242.9,87.5c-13.9-8-26.1,13.1-12.3,21.2,13.9,8,26.1-13.1,12.3-21.2Z"/>
+      </g>
+    </g>
+    <g>
+      <path class="st9" d="M168.1,348.5l117.8-203.4c7.8-13.5-6.6-41.9-6.6-41.9-33.3-79.5-13.8-66.5-99-57.5,0,0-31,2.2-38.8,15.7,0,0-118.3,204.2-118.3,204.2-7.8,13.5-3.2,30.9,10.3,38.7,0,0,94.5,54.8,94.5,54.8,14,8.1,31.9,3.3,40-10.7Z"/>
+      <g class="st8">
+        <path class="st2" d="M234.6,67.3c-13.9-8-26.1,13.1-12.3,21.2,13.9,8,26.1-13.1,12.3-21.2Z"/>
+      </g>
+    </g>
+    <rect class="st1" x="196" y="65.9" width="11.5" height="98.2" rx="5.7" ry="5.7" transform="translate(1.1 231.9) rotate(-59.9)"/>
+    <rect class="st1" x="178" y="86.8" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-17.2 221.7) rotate(-59.9)"/>
+    <rect class="st1" x="169.5" y="101.4" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-34.1 221.6) rotate(-59.9)"/>
+    <rect class="st1" x="162.3" y="114.1" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-48.6 221.7) rotate(-59.9)"/>
+    <rect class="st1" x="147.3" y="139.8" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-78.3 221.5) rotate(-59.9)"/>
+    <rect class="st1" x="139.7" y="153" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-93.6 221.5) rotate(-59.9)"/>
+    <rect class="st1" x="127.3" y="174.3" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-118.2 221.4) rotate(-59.9)"/>
+    <ellipse class="st1" cx="225.4" cy="160" rx="8.7" ry="6.1" transform="translate(-26 274.8) rotate(-59.9)"/>
+    <ellipse class="st1" cx="213.2" cy="182.4" rx="8.7" ry="6.1" transform="translate(-51.5 275.4) rotate(-59.9)"/>
+    <ellipse class="st1" cx="200.5" cy="204.4" rx="8.7" ry="6.1" transform="translate(-76.9 275.4) rotate(-59.9)"/>
+    <ellipse class="st1" cx="187.9" cy="226" rx="8.7" ry="6.1" transform="translate(-101.8 275.2) rotate(-59.9)"/>
+    <ellipse class="st1" cx="174.9" cy="248.6" rx="8.7" ry="6.1" transform="translate(-127.9 275.2) rotate(-59.9)"/>
+    <rect class="st1" x="114.6" y="196.3" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-143.5 221.4) rotate(-59.9)"/>
+    <rect class="st1" x="105.2" y="212.6" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-162.3 221.4) rotate(-59.9)"/>
+    <rect class="st1" x="96.9" y="226.7" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-178.7 221.3) rotate(-59.9)"/>
+    <rect class="st1" x="93.2" y="243.1" width="11.5" height="98.7" rx="5.7" ry="5.7" transform="translate(-203.8 231.4) rotate(-59.9)"/>
+    <ellipse class="st1" cx="163.7" cy="271.3" rx="8.7" ry="6.1" transform="translate(-153.1 276.9) rotate(-59.9)"/>
+    <ellipse class="st1" cx="151.5" cy="294" rx="8.7" ry="6.1" transform="translate(-178.8 277.7) rotate(-59.9)"/>
+  </g>
+  <g>
+    <path class="st0" d="M304.5,281.2c-4.1,4.6-10.2,9.5-15.4,13.2s-.7,1.3-.7,1.4c-42,27.7-100.5,9.4-120.1-36.5-4-9.4-5.7-19.4-6.8-29.6.7-5,.3-10.6,1.1-15.6,8.3-53.2,66.7-83.4,115.4-60.6,48.3,22.7,62.1,87.2,26.6,127.6ZM242,159c-49.2.3-81.4,52.8-60.5,97.3,21.4,45.4,83.1,52.7,114.7,13.6,36.5-45.1,3.5-111.3-54.2-111Z"/>
+    <path class="st3" d="M369.3,389.5l-6.4-.4c-1.3-1.1-3.1-1.4-4.6-2.2-4.9-2.7-7.8-7.7-11.4-11.7l28.8-25.6c3.3,3.9,7.7,7.5,9.8,12.3,5.6,12.6-3.2,25.9-16.2,27.7Z"/>
+    <path class="st3" d="M364.6,336.8l-29.3,25.1c-14.1-16-28.2-32-42.2-48.1-1.5-3,2.2-5.4,4.2-7.3,5.2-4.8,11.3-10.5,16.6-15,.1,0,.8,0,1.2-.4,2.1-1.7,4.6-5.3,7.3-2.9,14.2,16.1,28.2,32.3,42.2,48.6Z"/>
+    <path class="st0" d="M375.7,349.5l-28.8,25.6c-3.9-4.4-7.7-8.8-11.5-13.2l29.3-25.1c3.7,4.3,7.4,8.4,11.1,12.7Z"/>
+    <path class="st7" d="M304.5,281.2l9.4,10.3c-5.3,4.5-11.4,10.1-16.6,15l-8.9-10.7c0,0,.2-1,.7-1.4,5.2-3.7,11.3-8.6,15.4-13.2Z"/>
+    <path class="st5" d="M242,159c57.7-.3,90.7,65.8,54.2,111-31.6,39-93.3,31.8-114.7-13.6-20.9-44.5,11.3-97.1,60.5-97.3ZM214.3,188.8c-3.3.2-7.7,5.5-9.7,8.1-11.7,14.7-13.4,34.3-5.9,51.4,2.1,4.8,9.2,17.9,15.5,11.4,4.7-4.8-2.3-10.3-4.7-14.8-7.6-14.8-5.3-31.4,5.7-43.7,1.5-1.7,4.2-2.8,4.7-5.5s-2-7.2-5.6-6.9Z"/>
+    <path class="st11" d="M214.3,188.8c3.6-.2,6.3,3.4,5.6,6.9s-3.2,3.7-4.7,5.5c-11,12.3-13.3,28.9-5.7,43.7,2.4,4.6,9.4,10,4.7,14.8-6.3,6.5-13.5-6.6-15.5-11.4-7.5-17.1-5.8-36.7,5.9-51.4s6.4-7.9,9.7-8.1Z"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/ext_sources/ICONS/ic_drawer_verifica_giacenze.svg b/ext_sources/ICONS/ic_drawer_verifica_giacenze.svg
new file mode 100644
index 00000000..2aae171e
--- /dev/null
+++ b/ext_sources/ICONS/ic_drawer_verifica_giacenze.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Livello_1" xmlns="http://www.w3.org/2000/svg" baseProfile="tiny" version="1.2" viewBox="0 0 512 512">
+  <!-- Generator: Adobe Illustrator 29.0.1, SVG Export Plug-In . SVG Version: 2.1.0 Build 192)  -->
+  <path d="M28.9,99.2c-10.7,0-19.3,8.6-19.3,19.3v270.2c0,10.7,8.6,19.3,19.3,19.3s19.3-8.6,19.3-19.3V118.5c0-10.7-8.6-19.3-19.3-19.3ZM86.8,99.2c-10.7,0-19.3,8.6-19.3,19.3v270.2c0,10.7,8.6,19.3,19.3,19.3h38.6c10.7,0,19.3-8.6,19.3-19.3V118.5c0-10.7-8.6-19.3-19.3-19.3h-38.6ZM183.3,99.2c-10.7,0-19.3,8.6-19.3,19.3v270.2c0,10.7,8.6,19.3,19.3,19.3s19.3-8.6,19.3-19.3V118.5c0-10.7-8.6-19.3-19.3-19.3ZM241.2,99.2c-10.7,0-19.3,8.6-19.3,19.3v270.2c0,10.7,8.6,19.3,19.3,19.3h19.3c10.7,0,19.3-8.6,19.3-19.3V118.5c0-10.7-8.6-19.3-19.3-19.3h-19.3ZM318.4,99.2c-10.7,0-19.3,8.6-19.3,19.3v270.2c0,10.7,8.6,19.3,19.3,19.3s19.3-8.6,19.3-19.3V118.5c0-10.7-8.6-19.3-19.3-19.3ZM376.3,99.2c-10.7,0-19.3,8.6-19.3,19.3v270.2c0,10.7,8.6,19.3,19.3,19.3s19.3-8.6,19.3-19.3V118.5c0-10.7-8.6-19.3-19.3-19.3Z" fill="#010101"/>
+  <path d="M500.7,393l-59.2-59.2c34.7-42.5,25.7-103.8-16.8-138.6-42.5-34.7-105-28.4-139.8,14-34.7,42.5-28.4,105,14,139.8,36.6,29.9,87.9,32.7,124.5,2.8l59.2,59.2c3.9,3.8,11.5.9,15.3-3,3.7-3.8,6.5-11.1,2.8-15ZM361.9,345.6c-40.6,0-73.6-32.9-73.6-73.6s32.9-73.6,73.6-73.6,73.6,32.9,73.6,73.6c0,40.6-33,73.5-73.6,73.6Z" fill="#010101" stroke="#fff" stroke-miterlimit="10" stroke-width="4"/>
+  <circle cx="362.7" cy="271.4" r="72.8" fill="#fff"/>
+</svg>
\ No newline at end of file
diff --git a/ext_sources/ICONS/magnifyng_glass.svg b/ext_sources/ICONS/magnifyng_glass.svg
new file mode 100644
index 00000000..ca6d14fc
--- /dev/null
+++ b/ext_sources/ICONS/magnifyng_glass.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Livello_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 418.4 418.4">
+  <!-- Generator: Adobe Illustrator 29.0.1, SVG Export Plug-In . SVG Version: 2.1.0 Build 192)  -->
+  <defs>
+    <style>
+      .st0 {
+        fill: #676768;
+      }
+
+      .st1 {
+        fill: #f7991c;
+      }
+
+      .st2 {
+        fill: #545454;
+      }
+
+      .st3 {
+        fill: #70d0fd;
+      }
+
+      .st4 {
+        fill: #e2e9f7;
+      }
+    </style>
+  </defs>
+  <path class="st0" d="M256.4,237.2c-6.1,8-15.6,16.6-23.6,23.2-.8.7-1,2.2-1.1,2.3-65.3,49.8-162.6,26.4-199.6-46.1s-11.4-31-14.3-47.4c.5-8.2-.7-17.3,0-25.5C25.4,56.1,117.2.5,199,32.3s110.8,135.1,57.4,204.9ZM141,45.1C60.9,51,14.2,140.1,53.3,210.3s141.2,76.6,188.3,9.5c54.5-77.5-6.6-181.6-100.6-174.7Z"/>
+  <path class="st1" d="M373.8,406.4h-10.5c-2.3-1.6-5.2-1.9-7.7-3.1-8.2-3.9-13.6-11.6-19.9-17.9l44.1-44.9c5.8,6,13.3,11.3,17.3,19,10.4,19.8-2.3,42.5-23.3,46.9Z"/>
+  <path class="st1" d="M360.4,321.1l-44.9,44.2c-24.7-24.5-49.5-49-74.1-73.7-2.8-4.7,2.9-9.1,6-12.4,8-8.5,17.2-18.3,25.4-26.2s1.3-.2,1.9-.7c3.2-3,6.9-9.1,11.6-5.6,24.9,24.6,49.5,49.6,74.1,74.4Z"/>
+  <path class="st0" d="M379.8,340.5l-44.1,44.9c-6.8-6.7-13.4-13.5-20.2-20.2l44.9-44.2c6.5,6.5,13,12.9,19.5,19.5Z"/>
+  <path class="st2" d="M256.4,237.2l16.5,15.7c-8.2,7.9-17.4,17.7-25.4,26.2l-15.7-16.5c0,0,.2-1.6,1.1-2.3,8-6.6,17.5-15.2,23.6-23.2Z"/>
+  <path class="st3" d="M141,45.1c94-6.9,155.1,97.2,100.6,174.7-47.1,67.1-148.5,62.2-188.3-9.5s7.7-159.3,87.8-165.2ZM99.1,96.6c-5.4.7-11.9,9.9-15,14.3-17.5,25.2-18,57.4-4,84.4,3.9,7.5,17,28.1,26.6,16.8,7.1-8.4-4.9-16.4-9.3-23.6-14-23.2-12.2-50.6,4.4-71.8,2.3-3,6.5-5.1,7.1-9.4s-4-11.4-9.9-10.6Z"/>
+  <path class="st4" d="M99.1,96.6c5.8-.8,10.6,4.9,9.9,10.6s-4.8,6.4-7.1,9.4c-16.6,21.3-18.5,48.6-4.4,71.8s16.4,15.3,9.3,23.6c-9.6,11.3-22.7-9.3-26.6-16.8-14-27-13.5-59.2,4-84.4,3.1-4.4,9.6-13.5,15-14.3Z"/>
+</svg>
\ No newline at end of file
diff --git a/ext_sources/ICONS/search.svg b/ext_sources/ICONS/search.svg
new file mode 100644
index 00000000..0c9648b3
--- /dev/null
+++ b/ext_sources/ICONS/search.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Outline" viewBox="0 0 24 24" width="512" height="512"><path d="M23.707,22.293l-5.969-5.969a10.016,10.016,0,1,0-1.414,1.414l5.969,5.969a1,1,0,0,0,1.414-1.414ZM10,18a8,8,0,1,1,8-8A8.009,8.009,0,0,1,10,18Z"/></svg>
diff --git a/ext_sources/ICONS/tags.svg b/ext_sources/ICONS/tags.svg
new file mode 100644
index 00000000..442e4b7b
--- /dev/null
+++ b/ext_sources/ICONS/tags.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Livello_1" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 425.2 425.2">
+  <!-- Generator: Adobe Illustrator 29.0.1, SVG Export Plug-In . SVG Version: 2.1.0 Build 192)  -->
+  <defs>
+    <style>
+      .st0 {
+        fill: #505262;
+      }
+
+      .st1 {
+        fill: #fff;
+      }
+
+      .st2 {
+        fill: #dddfdf;
+      }
+
+      .st3 {
+        clip-path: url(#clippath-1);
+      }
+
+      .st4 {
+        clip-path: url(#clippath-2);
+      }
+
+      .st5 {
+        fill: #ededed;
+      }
+
+      .st6 {
+        clip-path: url(#clippath);
+      }
+    </style>
+    <clipPath id="clippath">
+      <path class="st5" d="M98.2,388.1h235c15.7,0,33-26.7,33-26.7,52.1-68.7,50.6-45.3.1-114.5,0,0-17.4-25.7-33.1-25.7H97.2c-15.7,0-28.3,12.7-28.3,28.3,0,0,0,109.3,0,109.3,0,16.2,13.1,29.3,29.3,29.3Z"/>
+    </clipPath>
+    <clipPath id="clippath-1">
+      <path class="st2" d="M69.2,340.4l67.1,38.9c14,8.1,31.9,3.3,40-10.7l117.8-203.4c7.8-13.5-6.6-41.9-6.6-41.9-33.2-79.5-13.7-66.5-98.9-57.4,0,0-16.8,1.2-28.8,7.2-4.3,2.2-89,243.8-91.1,247.4l.3,19.8Z"/>
+    </clipPath>
+    <clipPath id="clippath-2">
+      <path class="st5" d="M168.1,348.5l117.8-203.4c7.8-13.5-6.6-41.9-6.6-41.9-33.3-79.5-13.8-66.5-99-57.5,0,0-31,2.2-38.8,15.7,0,0-118.3,204.2-118.3,204.2-7.8,13.5-3.2,30.9,10.3,38.7,0,0,94.5,54.8,94.5,54.8,14,8.1,31.9,3.3,40-10.7Z"/>
+    </clipPath>
+  </defs>
+  <g>
+    <g>
+      <path class="st5" d="M98.2,388.1h235c15.7,0,33-26.7,33-26.7,52.1-68.7,50.6-45.3.1-114.5,0,0-17.4-25.7-33.1-25.7H97.2c-15.7,0-28.3,12.7-28.3,28.3,0,0,0,109.3,0,109.3,0,16.2,13.1,29.3,29.3,29.3Z"/>
+      <g class="st6">
+        <path class="st1" d="M374.8,304.6c0-16-24.4-16-24.5,0,0,16,24.4,16,24.5,0Z"/>
+      </g>
+    </g>
+    <rect class="st0" x="311.4" y="251" width="11.5" height="98.2" rx="5.7" ry="5.7"/>
+    <path class="st2" d="M70.4,367.9c3.8,11.7,14.9,20.2,27.9,20.2h235c10.6,0,22-12.3,28.2-20.2H70.4Z"/>
+    <rect class="st0" x="293" y="251" width="11.5" height="77.9" rx="5.7" ry="5.7"/>
+    <rect class="st0" x="276.1" y="251" width="11.5" height="77.9" rx="5.7" ry="5.7"/>
+    <rect class="st0" x="261.5" y="251.1" width="11.5" height="77.9" rx="5.7" ry="5.7"/>
+    <rect class="st0" x="231.7" y="251" width="11.5" height="77.9" rx="5.7" ry="5.7"/>
+    <rect class="st0" x="216.5" y="251.1" width="11.5" height="77.9" rx="5.7" ry="5.7"/>
+    <rect class="st0" x="191.8" y="251" width="11.5" height="77.9" rx="5.7" ry="5.7"/>
+    <ellipse class="st0" cx="290" cy="343.2" rx="8.7" ry="6.1"/>
+    <ellipse class="st0" cx="264.5" cy="343.8" rx="8.7" ry="6.1"/>
+    <ellipse class="st0" cx="239.1" cy="343.8" rx="8.7" ry="6.1"/>
+    <ellipse class="st0" cx="214.1" cy="343.8" rx="8.7" ry="6.1"/>
+    <ellipse class="st0" cx="188" cy="343.8" rx="8.7" ry="6.1"/>
+  </g>
+  <g>
+    <g>
+      <path class="st2" d="M69.2,340.4l67.1,38.9c14,8.1,31.9,3.3,40-10.7l117.8-203.4c7.8-13.5-6.6-41.9-6.6-41.9-33.2-79.5-13.7-66.5-98.9-57.4,0,0-16.8,1.2-28.8,7.2-4.3,2.2-89,243.8-91.1,247.4l.3,19.8Z"/>
+      <g class="st3">
+        <path class="st2" d="M242.9,87.5c-13.9-8-26.1,13.1-12.3,21.2,13.9,8,26.1-13.1,12.3-21.2Z"/>
+      </g>
+    </g>
+    <g>
+      <path class="st5" d="M168.1,348.5l117.8-203.4c7.8-13.5-6.6-41.9-6.6-41.9-33.3-79.5-13.8-66.5-99-57.5,0,0-31,2.2-38.8,15.7,0,0-118.3,204.2-118.3,204.2-7.8,13.5-3.2,30.9,10.3,38.7,0,0,94.5,54.8,94.5,54.8,14,8.1,31.9,3.3,40-10.7Z"/>
+      <g class="st4">
+        <path class="st1" d="M234.6,67.3c-13.9-8-26.1,13.1-12.3,21.2,13.9,8,26.1-13.1,12.3-21.2Z"/>
+      </g>
+    </g>
+    <rect class="st0" x="196" y="65.9" width="11.5" height="98.2" rx="5.7" ry="5.7" transform="translate(1.1 231.9) rotate(-59.9)"/>
+    <rect class="st0" x="178" y="86.8" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-17.2 221.7) rotate(-59.9)"/>
+    <rect class="st0" x="169.5" y="101.4" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-34.1 221.6) rotate(-59.9)"/>
+    <rect class="st0" x="162.3" y="114.1" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-48.6 221.7) rotate(-59.9)"/>
+    <rect class="st0" x="147.3" y="139.8" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-78.3 221.5) rotate(-59.9)"/>
+    <rect class="st0" x="139.7" y="153" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-93.6 221.5) rotate(-59.9)"/>
+    <rect class="st0" x="127.3" y="174.3" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-118.2 221.4) rotate(-59.9)"/>
+    <ellipse class="st0" cx="225.4" cy="160" rx="8.7" ry="6.1" transform="translate(-26 274.8) rotate(-59.9)"/>
+    <ellipse class="st0" cx="213.2" cy="182.4" rx="8.7" ry="6.1" transform="translate(-51.5 275.4) rotate(-59.9)"/>
+    <ellipse class="st0" cx="200.5" cy="204.4" rx="8.7" ry="6.1" transform="translate(-76.9 275.4) rotate(-59.9)"/>
+    <ellipse class="st0" cx="187.9" cy="226" rx="8.7" ry="6.1" transform="translate(-101.8 275.2) rotate(-59.9)"/>
+    <ellipse class="st0" cx="174.9" cy="248.6" rx="8.7" ry="6.1" transform="translate(-127.9 275.2) rotate(-59.9)"/>
+    <rect class="st0" x="114.6" y="196.3" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-143.5 221.4) rotate(-59.9)"/>
+    <rect class="st0" x="105.2" y="212.6" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-162.3 221.4) rotate(-59.9)"/>
+    <rect class="st0" x="96.9" y="226.7" width="11.5" height="77.9" rx="5.7" ry="5.7" transform="translate(-178.7 221.3) rotate(-59.9)"/>
+    <rect class="st0" x="93.2" y="243.1" width="11.5" height="98.7" rx="5.7" ry="5.7" transform="translate(-203.8 231.4) rotate(-59.9)"/>
+    <ellipse class="st0" cx="163.7" cy="271.3" rx="8.7" ry="6.1" transform="translate(-153.1 276.9) rotate(-59.9)"/>
+    <ellipse class="st0" cx="151.5" cy="294" rx="8.7" ry="6.1" transform="translate(-178.8 277.7) rotate(-59.9)"/>
+  </g>
+</svg>
\ No newline at end of file
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')
 }