diff --git a/app/build.gradle b/app/build.gradle
index 52491f55..ffaa4f0d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,6 +41,13 @@ android {
         versionName appVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.release
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments += ["room.schemaLocation":
+                                      "$projectDir/schemas".toString()]
+            }
+        }
     }
 
     buildTypes {
@@ -59,8 +66,9 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
-
+        coreLibraryDesugaringEnabled true
     }
+
     productFlavors {
     }
 
@@ -152,6 +160,8 @@ dependencies {
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
+    implementation "androidx.room:room-rxjava3:$room_version"
+    androidTestImplementation "androidx.room:room-testing:2.4.3"
 
     //AppUpdate
     implementation 'com.github.javiersantos:AppUpdater:2.7'
@@ -178,6 +188,9 @@ dependencies {
     // RxJava is also required.
     implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.0'
+
 }
 
 repositories {
diff --git a/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/11.json b/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/11.json
new file mode 100644
index 00000000..c2a83d4d
--- /dev/null
+++ b/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/11.json
@@ -0,0 +1,1017 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 11,
+    "identityHash": "1fbbe769d42f5fb33a56580bea8b11c6",
+    "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": {
+          "columnNames": [
+            "articolo_griglia_id"
+          ],
+          "autoGenerate": true
+        },
+        "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": {
+          "columnNames": [
+            "griglia_id"
+          ],
+          "autoGenerate": true
+        },
+        "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 NOT NULL)",
+        "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": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "ordine_id"
+          ],
+          "autoGenerate": true
+        },
+        "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, 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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "articolo_ordine_id"
+          ],
+          "autoGenerate": true
+        },
+        "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": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "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": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "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, `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": "remoteSyncDate",
+            "columnName": "remote_sync_date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "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": []
+      }
+    ],
+    "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, '1fbbe769d42f5fb33a56580bea8b11c6')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/12.json b/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/12.json
new file mode 100644
index 00000000..8fb21776
--- /dev/null
+++ b/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/12.json
@@ -0,0 +1,1017 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 12,
+    "identityHash": "1fbbe769d42f5fb33a56580bea8b11c6",
+    "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": {
+          "columnNames": [
+            "articolo_griglia_id"
+          ],
+          "autoGenerate": true
+        },
+        "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": {
+          "columnNames": [
+            "griglia_id"
+          ],
+          "autoGenerate": true
+        },
+        "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 NOT NULL)",
+        "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": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "ordine_id"
+          ],
+          "autoGenerate": true
+        },
+        "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, 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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "articolo_ordine_id"
+          ],
+          "autoGenerate": true
+        },
+        "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": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "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": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "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, `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": "remoteSyncDate",
+            "columnName": "remote_sync_date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "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": []
+      }
+    ],
+    "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, '1fbbe769d42f5fb33a56580bea8b11c6')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/13.json b/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/13.json
new file mode 100644
index 00000000..22819fb7
--- /dev/null
+++ b/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/13.json
@@ -0,0 +1,1023 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 13,
+    "identityHash": "ab9c1aa3a84db133a9d4463adc6ab388",
+    "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": {
+          "columnNames": [
+            "articolo_griglia_id"
+          ],
+          "autoGenerate": true
+        },
+        "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": {
+          "columnNames": [
+            "griglia_id"
+          ],
+          "autoGenerate": true
+        },
+        "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 NOT NULL)",
+        "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": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "ordine_id"
+          ],
+          "autoGenerate": true
+        },
+        "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, 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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "articolo_ordine_id"
+          ],
+          "autoGenerate": true
+        },
+        "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": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "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": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "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, `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": "remoteSyncDate",
+            "columnName": "remote_sync_date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "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": []
+      }
+    ],
+    "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, 'ab9c1aa3a84db133a9d4463adc6ab388')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/14.json b/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/14.json
new file mode 100644
index 00000000..c31de7dd
--- /dev/null
+++ b/app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/14.json
@@ -0,0 +1,1150 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 14,
+    "identityHash": "6a7fc5a013080ef96827187ce0637459",
+    "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": {
+          "columnNames": [
+            "articolo_griglia_id"
+          ],
+          "autoGenerate": true
+        },
+        "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": {
+          "columnNames": [
+            "griglia_id"
+          ],
+          "autoGenerate": true
+        },
+        "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 NOT NULL)",
+        "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": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "ordine_id"
+          ],
+          "autoGenerate": true
+        },
+        "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, 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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "articolo_ordine_id"
+          ],
+          "autoGenerate": true
+        },
+        "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": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "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": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "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, `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": "remoteSyncDate",
+            "columnName": "remote_sync_date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "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}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `parent_id` INTEGER, `cod_mart` TEXT NOT NULL, `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, `remote_sync_date` INTEGER, FOREIGN KEY(`parent_id`) REFERENCES `inventari`(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "codMart",
+            "columnName": "cod_mart",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "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": "remoteSyncDate",
+            "columnName": "remote_sync_date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_inventario_rows__id",
+            "unique": false,
+            "columnNames": [
+              "_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_inventario_rows__id` ON `${TABLE_NAME}` (`_id`)"
+          },
+          {
+            "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`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "inventari",
+            "onDelete": "NO ACTION",
+            "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, '6a7fc5a013080ef96827187ce0637459')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 38e73666..0ee7c2e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -74,6 +74,11 @@
             android:label="@string/activity_contenuto_bancale_title"
             android:screenOrientation="portrait"
             android:theme="@style/Light" />
+        <activity
+            android:name=".gest.inventario.picking.PickingInventarioActivity"
+            android:label="@string/activity_picking_inventario_title"
+            android:screenOrientation="portrait"
+            android:theme="@style/Light"/>
 
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
index 29167b5c..53932203 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
@@ -25,6 +25,16 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.sele
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsModule;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleComponent;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleModule;
+import it.integry.integrywmsnative.gest.inventario.ElencoInventariComponent;
+import it.integry.integrywmsnative.gest.inventario.ElencoInventariModule;
+import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_actions.BottomSheetInventarioActionsComponent;
+import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_actions.BottomSheetInventarioActionsModule;
+import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_actions.BottomSheetInventarioRowActionsComponent;
+import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_actions.BottomSheetInventarioRowActionsModule;
+import it.integry.integrywmsnative.gest.inventario.dialogs.ask_info_inventario.DialogAskInfoInventarioComponent;
+import it.integry.integrywmsnative.gest.inventario.dialogs.ask_info_inventario.DialogAskInfoInventarioModule;
+import it.integry.integrywmsnative.gest.inventario.picking.PickingInventarioComponent;
+import it.integry.integrywmsnative.gest.inventario.picking.PickingInventarioModule;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliComponent;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliModule;
 import it.integry.integrywmsnative.gest.login.LoginComponent;
@@ -61,7 +71,7 @@ import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEdi
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEditArticoloModule;
 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.DialogScanLisAComponent;
+import it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs.DialogScanGrigliaAcquistoComponent;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeComponent;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeModule;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneComponent;
@@ -76,6 +86,8 @@ import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviForn
 import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreModule;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceComponent;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceModule;
+import it.integry.integrywmsnative.view.bottom_sheet__item_edit.BottomSheetItemEditComponent;
+import it.integry.integrywmsnative.view.bottom_sheet__item_edit.BottomSheetItemEditModule;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteModule;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsComponent;
@@ -85,6 +97,8 @@ import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBat
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialogComponent;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdComponent;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdModule;
+import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUComponent;
+import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUModule;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Component;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Module;
 import it.integry.integrywmsnative.view.dialogs.printSsccUl.DialogPrintUlSSCCComponent;
@@ -113,6 +127,7 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         PVOrdineAcquistoEditModule.class,
         PickingLiberoModule.class,
         RettificaGiacenzeModule.class,
+        ElencoInventariModule.class,
         SpedizioneModule.class,
         AccettazionePickingModule.class,
         UltimeConsegneClienteModule.class,
@@ -141,7 +156,13 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         DialogPrintOrderSSCCListModule.class,
         ProdLineeProduzioneModule.class,
         ProdDettaglioLineaModule.class,
-        DialogPrintUlSSCCModule.class
+        DialogPrintUlSSCCModule.class,
+        DialogAskInfoInventarioModule.class,
+        DialogInputPesoLUModule.class,
+        PickingInventarioModule.class,
+        BottomSheetItemEditModule.class,
+        BottomSheetInventarioActionsModule.class,
+        BottomSheetInventarioRowActionsModule.class,
 })
 public interface MainApplicationComponent {
 
@@ -173,6 +194,8 @@ public interface MainApplicationComponent {
 
     RettificaGiacenzeComponent.Factory rettificaGiacenzeComponent();
 
+    ElencoInventariComponent.Factory inventarioComponent();
+
     SpedizioneComponent.Factory spedizioneComponent();
 
     AccettazionePickingComponent.Factory accettazionePickingComponent();
@@ -201,7 +224,7 @@ public interface MainApplicationComponent {
 
     DialogAskMagazzinoProssimitaComponent.Factory dialogAskMagazzinoProssimitaComponent();
 
-    DialogScanLisAComponent.Factory dialogScanLisAComponent();
+    DialogScanGrigliaAcquistoComponent.Factory dialogScanLisAComponent();
 
     DialogChooseBatchLotComponent.Factory dialogChooseBatchLotComponent();
 
@@ -239,6 +262,18 @@ public interface MainApplicationComponent {
 
     DialogPrintUlSSCCComponent.Factory dialogPrintUlSSCCComponent();
 
+    DialogAskInfoInventarioComponent.Factory dialogAskInfoInventarioComponent();
+
+    DialogInputPesoLUComponent.Factory dialogInputPesoLUComponent();
+
+    PickingInventarioComponent.Factory pickingInventarioComponent();
+
+    BottomSheetItemEditComponent.Factory bottomSheetItemEditComponent();
+
+    BottomSheetInventarioActionsComponent.Factory bottomSheetInventarioActionsComponent();
+
+    BottomSheetInventarioRowActionsComponent.Factory bottomSheetInventarioRowActionsComponent();
+
     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 be87d28a..e46802cd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
@@ -20,6 +20,7 @@ import it.integry.integrywmsnative.core.data_store.db.AppDatabase;
 import it.integry.integrywmsnative.core.menu.MenuRESTConsumer;
 import it.integry.integrywmsnative.core.menu.MenuService;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.AziendaRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.CommessaRESTConsumer;
@@ -37,6 +38,7 @@ import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ProductionLinesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.services.inventario.InventarioService;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.update.UpdatesManager;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
@@ -60,16 +62,22 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    public static ExecutorService providesExecutorService() {
+    public ExecutorService providesExecutorService() {
         return Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
     }
 
     @Provides
     @Singleton
-    public static Handler providesMainThreadHandler() {
+    public Handler providesMainThreadHandler() {
         return HandlerCompat.createAsync(Looper.getMainLooper());
     }
 
+    @Provides
+    @Singleton
+    public SettingsManager provideSettingsManager(SystemRESTConsumer systemRESTConsumer, AziendaRESTConsumer aziendaRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, GestSetupRESTConsumer gestSetupRESTConsumer) {
+        return new SettingsManager(mApplication, systemRESTConsumer, aziendaRESTConsumer, gestSetupRESTConsumer, posizioniRESTConsumer);
+    }
+
     @Provides
     @Singleton
     AppContext providesAppContext() {
@@ -152,8 +160,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    MagazzinoRESTConsumer provideMagazzinoRESTConsumer() {
-        return new MagazzinoRESTConsumer();
+    MagazzinoRESTConsumer provideMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new MagazzinoRESTConsumer(systemRESTConsumer);
     }
 
     @Provides
@@ -174,6 +182,12 @@ public class MainApplicationModule {
         return new ColliMagazzinoRESTConsumer(systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer);
     }
 
+    @Provides
+    @Singleton
+    AziendaRESTConsumer provideAziendaRESTConsumer() {
+        return new AziendaRESTConsumer();
+    }
+
     @Provides
     @Singleton
     BarcodeRESTConsumer provideBarcodeRESTConsumer() {
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 8e1c4763..48af157d 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
@@ -4,6 +4,7 @@ import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
 import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniFragment;
+import it.integry.integrywmsnative.gest.inventario.ElencoInventariFragment;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment;
@@ -164,6 +165,14 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setDrawerIcon(R.drawable.ic_black_empty_box)
                                         .setFragmentFactory(RettificaGiacenzeFragment::newInstance))
 
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_inventario)
+                                        .setCodMenu("MG062")
+                                        .setTitleText(R.string.inventario_fragment_title)
+                                        .setTitleIcon(R.drawable.ic_dashboard_rettifica_giacenze)
+                                        .setDrawerIcon(R.drawable.ic_black_empty_box)
+                                        .setFragmentFactory(ElencoInventariFragment::newInstance))
+
 
                 ).addGroup(
                         new MenuGroup()
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
index 27a11b70..4b65e475 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
@@ -31,6 +31,9 @@ public class AppContext {
     @Inject
     AppDatabase mAppDatabase;
 
+    @Inject
+    SettingsManager mSettingsManager;
+
     public AppContext(Context context) {
         this.mApplicationContext = context;
 
@@ -53,7 +56,7 @@ public class AppContext {
 
     private void initSettings() {
         Stash.init(mApplicationContext);
-        SettingsManager.init(mApplicationContext);
+        mSettingsManager.init();
     }
 
     private void initCrashlytics() {
@@ -80,7 +83,7 @@ public class AppContext {
         Logger.addLogAdapter(new AndroidLogAdapter());
 
         File logsFolder = new File(mApplicationContext.getExternalFilesDir(null).getAbsolutePath());
-        int maxBytesSize = 5000;
+        int maxBytesSize = 5 * 1024 * 1024;
         Logger.addLogAdapter(new DiskLogAdapter(logsFolder, maxBytesSize));
 
     }
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 a56b35d2..df247e7c 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
@@ -1,31 +1,79 @@
 package it.integry.integrywmsnative.core.data_store.db;
 
+import android.content.Context;
+
 import androidx.room.Database;
+import androidx.room.Room;
 import androidx.room.RoomDatabase;
 import androidx.room.TypeConverters;
+import androidx.room.migration.Migration;
+import androidx.sqlite.db.SupportSQLiteDatabase;
 
+import it.integry.integrywmsnative.core.data_store.db.converter.AppDatabaseConverters;
 import it.integry.integrywmsnative.core.data_store.db.converter.BigDecimalConverter;
 import it.integry.integrywmsnative.core.data_store.db.converter.DateConverter;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloGrigliaDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloOrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.GrigliaDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.InventarioDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.InventarioRowDao;
 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.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.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;
 
-@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class, SqlMtbColt.class, SqlMtbColr.class}, version = 10, exportSchema = false)
+@Database(entities = {
+        ArticoloGriglia.class,
+        Griglia.class,
+        Ordine.class,
+        ArticoloOrdine.class,
+        SqlMtbColt.class,
+        SqlMtbColr.class,
+        InventarioRoomDTO.class,
+        InventarioRowRoomDTO.class
+},
+        version = 15,
+        exportSchema = true)
 @TypeConverters({
         DateConverter.class,
-        BigDecimalConverter.class
+        BigDecimalConverter.class,
+        AppDatabaseConverters.class
 })
 public abstract class AppDatabase extends RoomDatabase {
 
+    /**
+     * The only instance
+     */
+    private static AppDatabase sInstance;
+
+    /**
+     * Gets the singleton instance of SampleDatabase.
+     *
+     * @param applicationContext The context.
+     * @return The singleton instance of SampleDatabase.
+     */
+    public static synchronized AppDatabase getInstance(Context applicationContext) {
+        if (sInstance == null) {
+            var builder = Room.databaseBuilder(applicationContext,
+                            AppDatabase.class, "integry_wms")
+                    .addMigrations(MIGRATION_10_11)
+                    .addMigrations(MIGRATION_11_12)
+                    .addMigrations(MIGRATION_12_13)
+                    .addMigrations(MIGRATION_13_14)
+                    .addMigrations(MIGRATION_14_15);
+
+            sInstance = builder.build();
+        }
+        return sInstance;
+    }
+
     public abstract ArticoloGrigliaDao articoloGrigliaDao();
 
     public abstract GrigliaDao grigliaDao();
@@ -38,5 +86,48 @@ public abstract class AppDatabase extends RoomDatabase {
 
     public abstract MtbColrDao mtbColrDao();
 
+    public abstract InventarioDao inventarioDao();
+
+    public abstract InventarioRowDao inventarioRowDao();
+
+
+    static final Migration MIGRATION_10_11 = new Migration(10, 11) {
+        @Override
+        public void migrate(SupportSQLiteDatabase database) {
+            database.execSQL("CREATE TABLE IF NOT EXISTS inventari (_id INTEGER PRIMARY KEY AUTOINCREMENT, 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, remote_sync_date INTEGER)");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_inventari__id ON inventari (_id)");
+        }
+    };
+
+    static final Migration MIGRATION_11_12 = new Migration(11, 12) {
+        @Override
+        public void migrate(SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE inventari ADD COLUMN id_inventario INTEGER");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_inventari_id_inventario ON inventari (id_inventario)");
+        }
+    };
+
+    static final Migration MIGRATION_12_13 = new Migration(12, 13) {
+        @Override
+        public void migrate(SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE inventari ADD COLUMN zona TEXT");
+        }
+    };
+
+    static final Migration MIGRATION_13_14 = new Migration(13, 14) {
+        @Override
+        public void migrate(SupportSQLiteDatabase database) {
+            database.execSQL("CREATE TABLE IF NOT EXISTS inventario_rows (_id INTEGER PRIMARY KEY AUTOINCREMENT, parent_id INTEGER, cod_mart TEXT NOT NULL, partita_mag 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, remote_sync_date INTEGER, FOREIGN KEY(parent_id) REFERENCES inventari(_id) ON UPDATE NO ACTION ON DELETE NO ACTION )");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_inventario_rows__id ON inventario_rows (_id)");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_inventario_rows__parent_id ON inventario_rows (parent_id)");
+        }
+    };
+    static final Migration MIGRATION_14_15 = new Migration(14, 15) {
+        @Override
+        public void migrate(SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE inventario_rows ADD COLUMN descrizione TEXT");
+        }
+    };
+
 
 }
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 8aa80e60..e9b8f6e8 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
@@ -3,8 +3,6 @@ package it.integry.integrywmsnative.core.data_store.db;
 import android.app.Application;
 import android.os.Handler;
 
-import androidx.room.Room;
-
 import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
@@ -14,6 +12,8 @@ import dagger.Provides;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloGrigliaDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloOrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.GrigliaDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.InventarioDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.InventarioRowDao;
 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;
@@ -23,23 +23,27 @@ import it.integry.integrywmsnative.core.data_store.db.repository.GrigliaReposito
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColrDataSource;
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.OrdineRepository;
-import it.integry.integrywmsnative.core.data_store.db.repository.implementations.ArticoliGrigliaDataSource;
-import it.integry.integrywmsnative.core.data_store.db.repository.implementations.ArticoliOrdineDataSource;
-import it.integry.integrywmsnative.core.data_store.db.repository.implementations.GrigliaDataSource;
-import it.integry.integrywmsnative.core.data_store.db.repository.implementations.OrdineDataSource;
-import it.integry.integrywmsnative.core.data_store.db.repository.implementations.SqlMtbColrDataSource;
-import it.integry.integrywmsnative.core.data_store.db.repository.implementations.SqlMtbColtDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.datasource.ArticoliGrigliaDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.datasource.ArticoliOrdineDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.datasource.GrigliaDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.datasource.OrdineDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.datasource.SqlMtbColrDataSource;
+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.data_source.InventarioLocalDataSource;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.data_source.InventarioRowLocalDataSource;
+import it.integry.integrywmsnative.core.mapper.InventarioMapper;
+import it.integry.integrywmsnative.core.mapper.InventarioRowMapper;
+import it.integry.integrywmsnative.core.rest.consumers.InventarioRESTConsumer;
 
 @Module
 public class RoomModule {
 
     private AppDatabase appDatabase;
 
-    public RoomModule(Application application) {
-        appDatabase = Room.databaseBuilder(application,
-                AppDatabase.class, "integry_wms")
-                .fallbackToDestructiveMigration()
-                .build();
+    public RoomModule(Application applicationContext) {
+        appDatabase = AppDatabase.getInstance(applicationContext);
     }
 
     @Singleton
@@ -87,6 +91,51 @@ public class RoomModule {
         return appDatabase.mtbColrDao();
     }
 
+    @Singleton
+    @Provides
+    InventarioDao providesInventarioDao(AppDatabase appDatabase) {
+        return appDatabase.inventarioDao();
+    }
+
+    @Singleton
+    @Provides
+    InventarioRowDao providesInventarioRowDao(AppDatabase appDatabase) {
+        return appDatabase.inventarioRowDao();
+    }
+
+
+
+
+
+
+
+
+    @Singleton
+    @Provides
+    InventarioRowMapper providesInventarioRowMapper() {
+        return new InventarioRowMapper();
+    }
+
+    @Singleton
+    @Provides
+    InventarioMapper providesInventarioMapper(InventarioRowMapper inventarioRowMapper) {
+        return new InventarioMapper(inventarioRowMapper);
+    }
+
+
+    @Singleton
+    @Provides
+    InventarioLocalDataSource providesInventarioLocalDataSource(ExecutorService executorService, InventarioDao inventarioDao) {
+        return new InventarioLocalDataSource(executorService, inventarioDao);
+    }
+
+
+    @Singleton
+    @Provides
+    InventarioRowLocalDataSource providesInventarioRowLocalDataSource(ExecutorService executorService, InventarioRowDao inventarioRowDao) {
+        return new InventarioRowLocalDataSource(executorService, inventarioRowDao);
+    }
+
 
 
 
@@ -129,4 +178,22 @@ public class RoomModule {
         return new SqlMtbColrDataSource(executorService, handler, mtbColrDao);
     }
 
+    @Singleton
+    @Provides
+    InventarioRepository providesInventarioRepository(ExecutorService executorService, Handler handler,
+                                                      InventarioLocalDataSource inventarioLocalDataSource,
+                                                      InventarioRESTConsumer inventarioRESTConsumer,
+                                                      InventarioMapper inventarioMapper) {
+        return new InventarioRepository(inventarioLocalDataSource, inventarioRESTConsumer, inventarioMapper, handler);
+    }
+
+    @Singleton
+    @Provides
+    InventarioRowRepository providesInventarioRowRepository(ExecutorService executorService, Handler handler,
+                                                            InventarioRowLocalDataSource inventarioRowLocalDataSource,
+                                                            InventarioRESTConsumer inventarioRESTConsumer,
+                                                            InventarioRowMapper inventarioRowMapper) {
+        return new InventarioRowRepository(inventarioRowLocalDataSource, inventarioRESTConsumer, inventarioRowMapper, handler);
+    }
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/converter/AppDatabaseConverters.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/converter/AppDatabaseConverters.java
new file mode 100644
index 00000000..613bc37e
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/converter/AppDatabaseConverters.java
@@ -0,0 +1,49 @@
+package it.integry.integrywmsnative.core.data_store.db.converter;
+
+import androidx.room.TypeConverter;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class AppDatabaseConverters {
+    @TypeConverter
+    public static LocalDateTime longToLocalDateTime(Long value) {
+        return value == null ? null : UtilityDate.timeToLocalDateTime(value, null);
+    }
+
+    @TypeConverter
+    public static Long localDateTimeToTimestamp(LocalDateTime date) {
+        return date == null ? null : UtilityDate.localDateTimeToTime(date, null);
+    }
+
+    @TypeConverter
+    public static LocalDate longToLocalDate(Long value) {
+        return value == null ? null : UtilityDate.timeToLocalDate(value, null);
+    }
+
+    @TypeConverter
+    public static Long localDateToTimestamp(LocalDate date) {
+        return date == null ? null : UtilityDate.localDateToTime(date);
+    }
+
+    @TypeConverter
+    public static ArrayList<String> fromString(String value) {
+        Type listType = new TypeToken<ArrayList<String>>() {}.getType();
+        return new Gson().fromJson(value, listType);
+    }
+
+    @TypeConverter
+    public static String fromArrayList(ArrayList<String> list) {
+        Gson gson = new Gson();
+        String json = gson.toJson(list);
+        return json;
+    }
+
+}
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
new file mode 100644
index 00000000..0ebb383c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/InventarioDao.java
@@ -0,0 +1,26 @@
+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.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityDaoInterface;
+
+@Dao
+public interface InventarioDao extends EntityDaoInterface<InventarioRoomDTO> {
+
+
+    @Query("SELECT * FROM " + InventarioRoomDTO.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))")
+    List<InventarioRoomDTO> selectAll(boolean toBeSync);
+
+
+    @Query("SELECT * FROM " + InventarioRoomDTO.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))")
+    Flowable<List<InventarioRoomDTO>> selectAllFlowable(boolean toBeSync);
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/InventarioRowDao.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/InventarioRowDao.java
new file mode 100644
index 00000000..dc698bbe
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/InventarioRowDao.java
@@ -0,0 +1,28 @@
+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.InventarioRowRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityDaoInterface;
+
+@Dao
+public interface InventarioRowDao extends EntityDaoInterface<InventarioRowRoomDTO> {
+
+    @Query("SELECT * FROM " + InventarioRowRoomDTO.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))")
+    List<InventarioRowRoomDTO> selectAll(boolean toBeSync);
+
+
+    @Query("SELECT * FROM " + InventarioRowRoomDTO.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))" +
+            "       AND " + InventarioRowRoomDTO.Columns.PARENT_ID + " = :parentId " +
+            " ORDER BY " +
+            "       CASE WHEN :reversed = 1 THEN " + BaseSyncDTO.Columns.ID + " END DESC," +
+            "       CASE WHEN :reversed = 0 THEN " + BaseSyncDTO.Columns.ID + " END ASC")
+    Flowable<List<InventarioRowRoomDTO>> selectAllFlowable(long parentId, boolean reversed, boolean toBeSync);
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/BaseRoomDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/BaseRoomDTO.java
new file mode 100644
index 00000000..2ec1b907
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/BaseRoomDTO.java
@@ -0,0 +1,4 @@
+package it.integry.integrywmsnative.core.data_store.db.entity;
+
+public abstract class BaseRoomDTO {
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/BaseSyncDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/BaseSyncDTO.java
new file mode 100644
index 00000000..5d1030de
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/BaseSyncDTO.java
@@ -0,0 +1,45 @@
+package it.integry.integrywmsnative.core.data_store.db.entity;
+
+import android.provider.BaseColumns;
+
+import androidx.room.ColumnInfo;
+import androidx.room.PrimaryKey;
+
+import java.util.Date;
+
+public abstract class BaseSyncDTO extends BaseRoomDTO {
+
+
+    public static class Columns {
+        public static final String ID = BaseColumns._ID;
+        public static final String COLUMN_REMOTE_SYNC_DATE = "remote_sync_date";
+    }
+
+    /** The unique ID of the cheese. */
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(index = true, name = Columns.ID)
+    private Long id;
+
+    @ColumnInfo(name = Columns.COLUMN_REMOTE_SYNC_DATE)
+    private Date remoteSyncDate;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getRemoteSyncDate() {
+        return remoteSyncDate;
+    }
+
+    public void setRemoteSyncDate(Date remoteSyncDate) {
+        this.remoteSyncDate = remoteSyncDate;
+    }
+
+    public boolean isSyncronized() {
+        return getRemoteSyncDate() != null;
+    }
+}
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/InventarioRoomDTO.java
new file mode 100644
index 00000000..93a69d30
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRoomDTO.java
@@ -0,0 +1,245 @@
+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 androidx.room.PrimaryKey;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+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 {
+
+    public static final String TABLE_NAME = "inventari";
+
+    public static class Columns {
+        public static final String ID_INVENTARIO = "id_inventario";
+        public static final String COD_MDEP = "cod_mdep";
+        public static final String DATA_INVENTARIO = "data_inventario";
+        public static final String DATA_REG = "data_reg";
+        public static final String DATA_VER = "data_ver";
+        public static final String FILTRO = "filtro";
+        public static final String FLAG_STATO = "flag_stato";
+        public static final String FLAG_OPERAZIONE = "flag_operazione";
+        public static final String COD_ANAG = "cod_anag";
+        public static final String COD_DTIP = "cod_dtip";
+        public static final String INSERITO_DA = "inserito_da";
+        public static final String REGISTRATO_DA = "registrato_da";
+        public static final String VERIFICATO_DA = "verificato_da";
+        public static final String DATA_ORA_INIZIO = "data_ora_inizio";
+        public static final String DATA_ORA_FINE = "data_ora_fine";
+        public static final String CAUSALE = "causale";
+        public static final String ZONA = "zona";
+    }
+
+    /** The unique ID of the cheese. */
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(index = true, name = BaseSyncDTO.Columns.ID)
+    private Long id;
+
+    /** The unique ID of the cheese. */
+    @ColumnInfo(index = true, name = Columns.ID_INVENTARIO)
+    private Long idInventario;
+
+    @NonNull
+    @ColumnInfo(name = Columns.COD_MDEP)
+    private String codMdep;
+
+    @ColumnInfo(name = Columns.DATA_INVENTARIO)
+    private LocalDate dataInventario;
+
+    @ColumnInfo(name = Columns.DATA_REG)
+    private LocalDateTime dataReg;
+
+    @ColumnInfo(name = Columns.DATA_VER)
+    private LocalDateTime dataVer;
+
+    @ColumnInfo(name = Columns.FILTRO)
+    private String filtro;
+
+    @ColumnInfo(name = Columns.FLAG_STATO)
+    private String flagStato;
+
+    @ColumnInfo(name = Columns.FLAG_OPERAZIONE)
+    private String flagOperazione;
+
+    @ColumnInfo(name = Columns.COD_ANAG)
+    private String codAnag;
+
+    @ColumnInfo(name = Columns.COD_DTIP)
+    private String codDtip;
+
+    @ColumnInfo(name = Columns.INSERITO_DA)
+    private String inseritoDa;
+
+    @ColumnInfo(name = Columns.REGISTRATO_DA)
+    private String registratoDa;
+
+    @ColumnInfo(name = Columns.VERIFICATO_DA)
+    private String verificatoDa;
+
+    @ColumnInfo(name = Columns.DATA_ORA_INIZIO)
+    private LocalDateTime dataOraInizio;
+
+    @ColumnInfo(name = Columns.DATA_ORA_FINE)
+    private LocalDateTime dataOraFine;
+
+    @ColumnInfo(name = Columns.CAUSALE)
+    private String causale;
+
+    @ColumnInfo(name = Columns.ZONA)
+    private String zona;
+
+    @Ignore
+    private List<InventarioRowRoomDTO> inventarioRowList;
+
+    public Long getIdInventario() {
+        return idInventario;
+    }
+
+    public void setIdInventario(Long idInventario) {
+        this.idInventario = idInventario;
+    }
+
+    @NonNull
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public void setCodMdep(@NonNull String codMdep) {
+        this.codMdep = codMdep;
+    }
+
+    public LocalDate getDataInventario() {
+        return dataInventario;
+    }
+
+    public void setDataInventario(LocalDate dataInventario) {
+        this.dataInventario = dataInventario;
+    }
+
+    public LocalDateTime getDataReg() {
+        return dataReg;
+    }
+
+    public void setDataReg(LocalDateTime dataReg) {
+        this.dataReg = dataReg;
+    }
+
+    public LocalDateTime getDataVer() {
+        return dataVer;
+    }
+
+    public void setDataVer(LocalDateTime dataVer) {
+        this.dataVer = dataVer;
+    }
+
+    public String getFiltro() {
+        return filtro;
+    }
+
+    public void setFiltro(String filtro) {
+        this.filtro = filtro;
+    }
+
+    public String getFlagStato() {
+        return flagStato;
+    }
+
+    public void setFlagStato(String flagStato) {
+        this.flagStato = flagStato;
+    }
+
+    public String getFlagOperazione() {
+        return flagOperazione;
+    }
+
+    public void setFlagOperazione(String flagOperazione) {
+        this.flagOperazione = flagOperazione;
+    }
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public void setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+    }
+
+    public String getCodDtip() {
+        return codDtip;
+    }
+
+    public void setCodDtip(String codDtip) {
+        this.codDtip = codDtip;
+    }
+
+    public String getInseritoDa() {
+        return inseritoDa;
+    }
+
+    public void setInseritoDa(String inseritoDa) {
+        this.inseritoDa = inseritoDa;
+    }
+
+    public String getRegistratoDa() {
+        return registratoDa;
+    }
+
+    public void setRegistratoDa(String registratoDa) {
+        this.registratoDa = registratoDa;
+    }
+
+    public String getVerificatoDa() {
+        return verificatoDa;
+    }
+
+    public void setVerificatoDa(String verificatoDa) {
+        this.verificatoDa = verificatoDa;
+    }
+
+    public LocalDateTime getDataOraInizio() {
+        return dataOraInizio;
+    }
+
+    public void setDataOraInizio(LocalDateTime dataOraInizio) {
+        this.dataOraInizio = dataOraInizio;
+    }
+
+    public LocalDateTime getDataOraFine() {
+        return dataOraFine;
+    }
+
+    public void setDataOraFine(LocalDateTime dataOraFine) {
+        this.dataOraFine = dataOraFine;
+    }
+
+    public String getCausale() {
+        return causale;
+    }
+
+    public void setCausale(String causale) {
+        this.causale = causale;
+    }
+
+    public String getZona() {
+        return zona;
+    }
+
+    public void setZona(String zona) {
+        this.zona = zona;
+    }
+
+    public List<InventarioRowRoomDTO> getInventarioRowList() {
+        return inventarioRowList;
+    }
+
+    public void setInventarioRowList(List<InventarioRowRoomDTO> inventarioRowList) {
+        this.inventarioRowList = inventarioRowList;
+    }
+}
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
new file mode 100644
index 00000000..a4c3c5eb
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRowRoomDTO.java
@@ -0,0 +1,180 @@
+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 androidx.room.PrimaryKey;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityModelInterface;
+
+@Entity(
+        tableName = InventarioRowRoomDTO.TABLE_NAME,
+        foreignKeys = {
+                @ForeignKey(
+                        entity = InventarioRoomDTO.class,
+                        parentColumns = {BaseSyncDTO.Columns.ID},
+                        childColumns = {InventarioRowRoomDTO.Columns.PARENT_ID}
+                )
+        }
+)
+public class InventarioRowRoomDTO extends BaseSyncDTO implements EntityModelInterface {
+
+    public static final String TABLE_NAME = "inventario_rows";
+
+    public static class Columns {
+        public static final String PARENT_ID = "parent_id";
+        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 = "qta";
+        public static final String NUM_CNF = "num_cnf";
+        public static final String QTA_CNF = "qta_cnf";
+        public static final String UNT_MIS = "unt_mis";
+        public static final String DATA_ORA_INV = "data_ora_inv";
+        public static final String SCAN_COD_BARRE = "scan_cod_barre";
+        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;
+
+    @NonNull
+    @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, 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;
+
+    @NonNull
+    @ColumnInfo(name = Columns.UNT_MIS, defaultValue = "0")
+    private String untMis;
+
+    @ColumnInfo(name = Columns.DATA_ORA_INV)
+    private LocalDateTime dataOraInv;
+
+    @ColumnInfo(name = Columns.SCAN_COD_BARRE)
+    private String scanCodBarre;
+
+    @ColumnInfo(name = Columns.ZONA)
+    private String zona;
+
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    @NonNull
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public void setCodMart(@NonNull 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 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;
+    }
+
+    @NonNull
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public void setUntMis(@NonNull String untMis) {
+        this.untMis = untMis;
+    }
+
+    public LocalDateTime getDataOraInv() {
+        return dataOraInv;
+    }
+
+    public void setDataOraInv(LocalDateTime dataOraInv) {
+        this.dataOraInv = dataOraInv;
+    }
+
+    public String getScanCodBarre() {
+        return scanCodBarre;
+    }
+
+    public void setScanCodBarre(String scanCodBarre) {
+        this.scanCodBarre = scanCodBarre;
+    }
+
+    public String getZona() {
+        return zona;
+    }
+
+    public void setZona(String zona) {
+        this.zona = zona;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/interfaces/EntityDaoInterface.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/interfaces/EntityDaoInterface.java
new file mode 100644
index 00000000..b273cc18
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/interfaces/EntityDaoInterface.java
@@ -0,0 +1,31 @@
+package it.integry.integrywmsnative.core.data_store.db.interfaces;
+
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.RawQuery;
+import androidx.room.Update;
+import androidx.sqlite.db.SupportSQLiteQuery;
+
+import java.util.List;
+
+public interface EntityDaoInterface<R> {
+
+    @RawQuery()
+    List<R> execRaw(SupportSQLiteQuery query);
+
+    @Insert
+    long insert(R objectToInsert);
+
+    @Insert
+    List<Long> insertAll(List<R> objectToInsert);
+
+    @Delete
+    void delete(R objectToInsert);
+
+    @Update
+    void updateAll(List<R> cheese);
+
+    @Update
+    int update(R cheese);
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/interfaces/EntityModelInterface.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/interfaces/EntityModelInterface.java
new file mode 100644
index 00000000..db6cc6b1
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/interfaces/EntityModelInterface.java
@@ -0,0 +1,9 @@
+package it.integry.integrywmsnative.core.data_store.db.interfaces;
+
+public interface EntityModelInterface {
+
+    void setId(Long id);
+
+    Long getId();
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/ArticoliGrigliaDataSource.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/ArticoliGrigliaDataSource.java
similarity index 99%
rename from app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/ArticoliGrigliaDataSource.java
rename to app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/ArticoliGrigliaDataSource.java
index 3fecc7e7..8961e841 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/ArticoliGrigliaDataSource.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/ArticoliGrigliaDataSource.java
@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.core.data_store.db.repository.implementations;
+package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
 
 import android.os.Handler;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/ArticoliOrdineDataSource.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/ArticoliOrdineDataSource.java
similarity index 99%
rename from app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/ArticoliOrdineDataSource.java
rename to app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/ArticoliOrdineDataSource.java
index f82cac17..fee12d13 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/ArticoliOrdineDataSource.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/ArticoliOrdineDataSource.java
@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.core.data_store.db.repository.implementations;
+package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
 
 import android.os.Handler;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/BaseDataSource.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/BaseDataSource.java
similarity index 98%
rename from app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/BaseDataSource.java
rename to app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/BaseDataSource.java
index b19983f3..3aa26405 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/BaseDataSource.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/BaseDataSource.java
@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.core.data_store.db.repository.implementations;
+package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
 
 import android.os.Handler;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/GrigliaDataSource.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/GrigliaDataSource.java
similarity index 99%
rename from app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/GrigliaDataSource.java
rename to app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/GrigliaDataSource.java
index f4c08fcf..c6d1b280 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/GrigliaDataSource.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/GrigliaDataSource.java
@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.core.data_store.db.repository.implementations;
+package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
 
 import android.os.Handler;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/OrdineDataSource.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/OrdineDataSource.java
similarity index 99%
rename from app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/OrdineDataSource.java
rename to app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/OrdineDataSource.java
index 9b37898c..16418af2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/OrdineDataSource.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/OrdineDataSource.java
@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.core.data_store.db.repository.implementations;
+package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
 
 import android.os.Handler;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/SqlMtbColrDataSource.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/SqlMtbColrDataSource.java
similarity index 99%
rename from app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/SqlMtbColrDataSource.java
rename to app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/SqlMtbColrDataSource.java
index 5ebad272..75a39c9f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/SqlMtbColrDataSource.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/SqlMtbColrDataSource.java
@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.core.data_store.db.repository.implementations;
+package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
 
 import android.os.Handler;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/SqlMtbColtDataSource.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/SqlMtbColtDataSource.java
similarity index 99%
rename from app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/SqlMtbColtDataSource.java
rename to app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/SqlMtbColtDataSource.java
index 341bbe32..b2eaac80 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/SqlMtbColtDataSource.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/SqlMtbColtDataSource.java
@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.core.data_store.db.repository.implementations;
+package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
 
 import android.os.Handler;
 
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
new file mode 100644
index 00000000..84ce2d72
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java
@@ -0,0 +1,63 @@
+package it.integry.integrywmsnative.core.data_store.db.respository_new;
+
+import android.os.Handler;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import java.util.Date;
+import java.util.List;
+
+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.respository_new.data_source.InventarioLocalDataSource;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.mapper.InventarioMapper;
+import it.integry.integrywmsnative.core.model.MtbInvent;
+import it.integry.integrywmsnative.core.rest.consumers.InventarioRESTConsumer;
+
+public class InventarioRepository extends _BaseRepository<MtbInvent, InventarioRoomDTO, InventarioMapper, InventarioLocalDataSource, InventarioRESTConsumer> {
+
+    private final Handler handler;
+
+    private final MutableLiveData<List<InventarioRoomDTO>> internalLiveData = new MutableLiveData<>();
+
+    @Inject
+    public InventarioRepository(InventarioLocalDataSource localDataSource,
+                                InventarioRESTConsumer remoteDataSource,
+                                InventarioMapper dataMapper,
+                                Handler handler) {
+        super(dataMapper, localDataSource, remoteDataSource);
+        this.handler = handler;
+    }
+
+
+    public LiveData<List<InventarioRoomDTO>> retrieve() {
+        localDataSource.makeSynchronousRetrieveAllLive(false)
+                .observeOn(Schedulers.io())
+                .subscribe(internalLiveData::postValue);
+//        refresh(onComplete, onError);
+
+        return internalLiveData;
+    }
+
+
+    public void insert(InventarioRoomDTO 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) {
+        remoteDataSource.makeInsertRequest(dataMapper.mapRoomToRest(inventarioDTO), () -> {
+            inventarioDTO.setRemoteSyncDate(new Date());
+
+            localDataSource.makeUpdateRequest(inventarioDTO, (ignored) -> {
+                handler.post(onComplete);
+            }, onError);
+        }, onError);
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRowRepository.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRowRepository.java
new file mode 100644
index 00000000..62b0bfd5
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRowRepository.java
@@ -0,0 +1,64 @@
+package it.integry.integrywmsnative.core.data_store.db.respository_new;
+
+import android.os.Handler;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.data_source.InventarioRowLocalDataSource;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.mapper.InventarioRowMapper;
+import it.integry.integrywmsnative.core.model.MtbInvenr;
+import it.integry.integrywmsnative.core.rest.consumers.InventarioRESTConsumer;
+
+public class InventarioRowRepository extends _BaseRepository<MtbInvenr, InventarioRowRoomDTO, InventarioRowMapper, InventarioRowLocalDataSource, InventarioRESTConsumer> {
+
+    private final Handler handler;
+    private final MutableLiveData<List<InventarioRowRoomDTO>> internalLiveData = new MutableLiveData<>();
+
+    @Inject
+    public InventarioRowRepository(InventarioRowLocalDataSource localDataSource,
+                                   InventarioRESTConsumer remoteDataSource,
+                                   InventarioRowMapper dataMapper,
+                                   Handler handler) {
+        super(dataMapper, localDataSource, remoteDataSource);
+        this.handler = handler;
+    }
+
+
+    public LiveData<List<InventarioRowRoomDTO>> retrieve(long parentId) {
+        localDataSource.makeSynchronousRetrieveAllLive(parentId, true, false)
+                .observeOn(Schedulers.io())
+                .subscribe(internalLiveData::postValue);
+//        refresh(onComplete, onError);
+
+        return internalLiveData;
+    }
+
+
+    public void insert(InventarioRowRoomDTO inventarioRowDTO, Runnable onComplete, RunnableArgs<Exception> onError) {
+        localDataSource.makeInsertRequest(inventarioRowDTO, localResult -> {
+            if (onComplete != null) handler.post(onComplete);
+        }, onError);
+    }
+
+
+    public void delete(InventarioRowRoomDTO inventarioRowDTO, Runnable onComplete, RunnableArgs<Exception> onError) {
+        localDataSource.makeDeleteRequest(inventarioRowDTO, onComplete, onError);
+    }
+
+
+    public void update(InventarioRowRoomDTO inventarioRowDTO, Runnable onComplete, RunnableArgs<Exception> onError) {
+        inventarioRowDTO.setRemoteSyncDate(null);
+
+        localDataSource.makeUpdateRequest(inventarioRowDTO, localResult -> {
+            if (onComplete != null) handler.post(onComplete);
+        }, onError);
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/_BaseRepository.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/_BaseRepository.java
new file mode 100644
index 00000000..f5d52879
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/_BaseRepository.java
@@ -0,0 +1,80 @@
+package it.integry.integrywmsnative.core.data_store.db.respository_new;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.BaseSyncDTO;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.data_source._BaseRoomDataSource;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.RunnableArgss;
+import it.integry.integrywmsnative.core.expansion.RunnableArgssWithReturn;
+import it.integry.integrywmsnative.core.mapper.BaseMapper;
+import it.integry.integrywmsnative.core.model.BaseRestDTO;
+import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+
+public abstract class _BaseRepository<
+        A extends BaseRestDTO,
+        B extends BaseSyncDTO,
+        T extends BaseMapper<A, B>,
+        U extends _BaseRoomDataSource<B, ?>,
+        V extends _BaseRESTConsumer> {
+
+    protected final T dataMapper;
+    protected final U localDataSource;
+    protected final V remoteDataSource;
+
+    public _BaseRepository(T dataMapper, U localDataSource, V remoteDataSource) {
+        this.dataMapper = dataMapper;
+        this.localDataSource = localDataSource;
+        this.remoteDataSource = remoteDataSource;
+    }
+
+    protected void resolveFetch(List<A> remoteData,
+                                List<B> localData,
+                                RunnableArgssWithReturn<B, B, Boolean> keyComparator,
+                                RunnableArgss<B, B> dataCopy,
+                                Runnable onComplete,
+                                RunnableArgs<Exception> onError) {
+        List<B> finalRemoteData = dataMapper.mapRestsToRooms(remoteData);
+
+        if (localData == null) localData = new ArrayList<>();
+        List<B> finalLocalData = localData;
+
+        for (var x : finalRemoteData) {
+            var matched = finalLocalData.stream().filter(y -> keyComparator.run(y, x))
+                    .findFirst()
+                    .orElse(null);
+
+            if (matched != null) {
+                x.setId(matched.getId());
+                dataCopy.run(x, matched);
+            }
+        }
+
+
+        var dataToUpdate = finalRemoteData.stream()
+                .filter(x -> x.getId() != null && finalLocalData.stream().noneMatch(x::equals))
+                .collect(Collectors.toList());
+
+        var dataToDelete = finalLocalData.stream()
+                .filter(x -> x.isSyncronized() && finalRemoteData.stream().noneMatch(y -> keyComparator.run(y, x)))
+                .collect(Collectors.toList());
+
+        var dataToInsert = finalRemoteData.stream()
+                .filter(x -> x.getId() == null)
+                .collect(Collectors.toList());
+
+
+        localDataSource.makeUpdateAllRequest(dataToUpdate, localUpdateResult -> {
+
+            localDataSource.makeDeleteAllRequest(dataToDelete, () -> {
+
+                localDataSource.makeInsertAllRequest(dataToInsert, onComplete, onError);
+
+            }, onError);
+
+        }, onError);
+    }
+
+}
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
new file mode 100644
index 00000000..4b9581e9
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/InventarioLocalDataSource.java
@@ -0,0 +1,32 @@
+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.InventarioDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+
+@Singleton
+public class InventarioLocalDataSource extends _BaseRoomDataSource<InventarioRoomDTO, InventarioDao> {
+
+    @Inject
+    public InventarioLocalDataSource(ExecutorService executorService, InventarioDao entityDao) {
+        super(executorService, entityDao, InventarioRoomDTO.TABLE_NAME);
+    }
+
+    @Override
+    public List<InventarioRoomDTO> makeSynchronousRetrieveAllRequest(boolean onlyToBeSync) {
+        return entityDao
+                .selectAll(onlyToBeSync);
+    }
+
+    @Override
+    public Flowable<List<InventarioRoomDTO>> 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/InventarioRowLocalDataSource.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/InventarioRowLocalDataSource.java
new file mode 100644
index 00000000..385ec16c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/InventarioRowLocalDataSource.java
@@ -0,0 +1,37 @@
+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.InventarioRowDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
+
+@Singleton
+public class InventarioRowLocalDataSource extends _BaseRoomDataSource<InventarioRowRoomDTO, InventarioRowDao> {
+
+    @Inject
+    public InventarioRowLocalDataSource(ExecutorService executorService, InventarioRowDao entityDao) {
+        super(executorService, entityDao, InventarioRowRoomDTO.TABLE_NAME);
+    }
+
+    @Override
+    public List<InventarioRowRoomDTO> makeSynchronousRetrieveAllRequest(boolean onlyToBeSync) {
+        return entityDao
+                .selectAll(onlyToBeSync);
+    }
+
+    @Override
+    public Flowable<List<InventarioRowRoomDTO>> makeSynchronousRetrieveAllLive(boolean onlyToBeSync) {
+        return entityDao
+                .selectAllFlowable(-1, false, onlyToBeSync);
+    }
+
+    public Flowable<List<InventarioRowRoomDTO>> makeSynchronousRetrieveAllLive(long parentId, boolean reversed, boolean onlyToBeSync) {
+        return entityDao
+                .selectAllFlowable(parentId, reversed, onlyToBeSync);
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/_BaseRoomDataSource.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/_BaseRoomDataSource.java
new file mode 100644
index 00000000..a14ea1c4
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/data_source/_BaseRoomDataSource.java
@@ -0,0 +1,175 @@
+package it.integry.integrywmsnative.core.data_store.db.respository_new.data_source;
+
+import androidx.annotation.NonNull;
+import androidx.sqlite.db.SimpleSQLiteQuery;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+import io.reactivex.rxjava3.core.Flowable;
+import it.integry.integrywmsnative.core.data_store.db.entity.BaseSyncDTO;
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityDaoInterface;
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityModelInterface;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public abstract class _BaseRoomDataSource<R extends BaseSyncDTO, T extends EntityDaoInterface<R>> {
+
+    protected final ExecutorService executorService;
+    protected final T entityDao;
+
+    protected final String TABLE_NAME;
+
+    public _BaseRoomDataSource(ExecutorService executorService, T entityDao, String tableName) {
+        this.executorService = executorService;
+        this.entityDao = entityDao;
+        this.TABLE_NAME = tableName;
+    }
+
+
+    public void makeRetrieveAllRequest(boolean onlyToBeSync, final RunnableArgs<List<R>> onComplete, final RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                if (onComplete != null)
+                    onComplete.run(makeSynchronousRetrieveAllRequest(onlyToBeSync));
+            } catch (Exception ex) {
+                if (onError != null) onError.run(ex);
+            }
+        });
+    }
+
+    public abstract List<R> makeSynchronousRetrieveAllRequest(boolean onlyToBeSync);
+
+    public abstract Flowable<List<R>> makeSynchronousRetrieveAllLive(boolean onlyToBeSync);
+
+
+    public void makeInsertAllRequest(final List<R> itemsToInsert, final Runnable onComplete, final RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                makeSynchronousInsertAllRequest(itemsToInsert);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onError != null) onError.run(ex);
+            }
+        });
+    }
+
+    public void makeSynchronousInsertAllRequest(final List<R> itemsToInsert) {
+        if(itemsToInsert == null) return;
+
+        var ids = entityDao.insertAll(itemsToInsert);
+
+        for(int i = 0; i < itemsToInsert.size(); i++) {
+            var inputObject = itemsToInsert.get(i);
+
+            if (inputObject instanceof EntityModelInterface) {
+                ((EntityModelInterface) inputObject).setId(ids.get(i));
+            }
+        }
+    }
+
+
+    public void makeInsertRequest(final R itemToInsert, final RunnableArgs<R> onComplete, final RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                makeSynchronousInsertRequest(itemToInsert);
+                if (onComplete != null) onComplete.run(itemToInsert);
+            } catch (Exception ex) {
+                if (onError != null) onError.run(ex);
+            }
+        });
+    }
+
+    public void makeSynchronousInsertRequest(final R itemToInsert) {
+        var id = entityDao.insert(itemToInsert);
+
+        if (itemToInsert instanceof EntityModelInterface) {
+            ((EntityModelInterface) itemToInsert).setId(id);
+        }
+    }
+
+
+    public void makeUpdateRequest(final R itemToUpdate, final RunnableArgs<R> onComplete, final RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                makeSynchronousUpdateRequest(itemToUpdate);
+                if (onComplete != null) onComplete.run(itemToUpdate);
+            } catch (Exception ex) {
+                if (onError != null) onError.run(ex);
+            }
+        });
+    }
+
+    public void makeSynchronousUpdateRequest(final R itemToUpdate) {
+        var id = entityDao.update(itemToUpdate);
+    }
+
+
+    public void makeUpdateAllRequest(final List<R> itemToUpdate, final RunnableArgs<List<R>> onComplete, final RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                makeSynchronousUpdateAllRequest(itemToUpdate);
+                if (onComplete != null) onComplete.run(itemToUpdate);
+            } catch (Exception ex) {
+                if (onError != null) onError.run(ex);
+            }
+        });
+    }
+
+    public void makeSynchronousUpdateAllRequest(final List<R> itemsToUpdate) {
+        if(itemsToUpdate == null) return;
+        entityDao.updateAll(itemsToUpdate);
+    }
+
+
+    public void makeDeleteRequest(@NonNull final R itemToDelete, final Runnable onComplete, final RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                makeSynchronousDeleteRequest(itemToDelete);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onError != null) onError.run(ex);
+            }
+        });
+    }
+
+    public void makeSynchronousDeleteRequest(@NonNull final R itemToDelete) {
+        entityDao.delete(itemToDelete);
+    }
+
+
+    public void makeDeleteAllRequest(@NonNull final List<R> itemsToDelete, final Runnable onComplete, final RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                makeSynchronousDeleteAllRequest(itemsToDelete);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onError != null) onError.run(ex);
+            }
+        });
+    }
+
+    public void makeSynchronousDeleteAllRequest(@NonNull final List<R> itemsToDelete) {
+        for (R itemToDelete : itemsToDelete) {
+            makeSynchronousDeleteRequest(itemToDelete);
+        }
+    }
+
+
+    public void makeClearAllDataRequest(boolean excludeNotSync, final Runnable onComplete, final RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                makeSynchronousClearAllDataRequest(excludeNotSync);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onError != null) onError.run(ex);
+            }
+        });
+    }
+
+    public void makeSynchronousClearAllDataRequest(boolean excludeNotSync) {
+        entityDao
+                .execRaw(new SimpleSQLiteQuery("DELETE FROM " + TABLE_NAME + (excludeNotSync ? " WHERE " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NOT NULL" : "")));
+    }
+
+
+}
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 fb1238cf..b6b6421b 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
@@ -226,6 +226,33 @@ public class Converters {
         }
     }
 
+    @BindingAdapter("binding")
+    public static void bindTextInputEditTextBigDecimal(EditText view, final ObservableField<BigDecimal> observableBigDecimal) {
+        Pair<ObservableField<BigDecimal>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableBigDecimal) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    BigDecimal value = null;
+                    if (!UtilityString.isNullOrEmpty(s.toString()))
+                        value = new BigDecimal(s.toString());
+                    observableBigDecimal.set(value);
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableBigDecimal, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        BigDecimal newValue = observableBigDecimal.get();
+        BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
+
+        if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
+            view.setText(UtilityNumber.decimalToString(newValue));
+        }
+    }
+
     @BindingAdapter("binding")
     public static void bindTextInputEditTextBigDecimal(TextInputEditText view, final BindableBigDecimal bindableBigDecimal) {
         Pair<BindableBigDecimal, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -304,6 +331,33 @@ public class Converters {
         }
     }
 
+    @BindingAdapter("binding")
+    public static void bindTextInputEditTextInteger(TextInputEditText view, final ObservableField<Integer> observableInteger) {
+        Pair<ObservableField<Integer>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableInteger) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    Integer value = null;
+                    if (!UtilityString.isNullOrEmpty(s.toString()))
+                        value = Integer.valueOf(s.toString());
+                    observableInteger.set(value);
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableInteger, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        Integer newValue = observableInteger.get();
+        Integer viewValue = view.getText().toString().trim().length() > 0 ? Integer.valueOf(view.getText().toString()) : Integer.valueOf(0);
+
+        if (!viewValue.equals(newValue) && newValue != null) {
+            view.setText(newValue.toString());
+        }
+    }
+
     @BindingAdapter(value = {"binding", "parentView", "warningOnOldDates"}, requireAll = false)
     public static void bindTextInputEditTextDate(TextInputEditText view, final ObservableField<Date> observableDate, BaseDialogFragment parentFragment, boolean warningOnOldDates) {
         Pair<ObservableField<Date>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -374,6 +428,76 @@ public class Converters {
         view.setText(UtilityDate.formatDate(newValue, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
     }
 
+    @BindingAdapter(value = {"binding", "parentView", "warningOnOldDates"}, requireAll = false)
+    public static void bindEditTextDate(EditText view, final ObservableField<Date> observableDate, BaseDialogFragment parentFragment, boolean warningOnOldDates) {
+        Pair<ObservableField<Date>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableDate) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableDate, watcher));
+            view.addTextChangedListener(watcher);
+
+            RunnableArgs<View> onClick = v -> {
+                // Get Current Date
+                Calendar c = UtilityDate.getCalendarInstance();
+
+                if (observableDate.get() != null) {
+                    c.setTime(observableDate.get());
+                }
+
+
+                var datePicker =
+                        MaterialDatePicker.Builder.datePicker()
+                                .setSelection(c.getTimeInMillis())
+                                .build();
+
+                datePicker.addOnDismissListener(dialog -> {
+                    if(datePicker.getSelection() != null) {
+                        var timeInMillis = datePicker.getSelection();
+
+                        var calendar = UtilityDate.getCalendarInstance();
+                        calendar.setTimeInMillis(timeInMillis);
+
+                        if (parentFragment != null && warningOnOldDates && calendar.before(UtilityDate.getCalendarInstance())) {
+                            DialogSimpleMessageView
+                                    .makeWarningDialog(new SpannableString("Hai scelto una data precedente a quella odierna. Continuare?"), null, () -> {
+                                        view.setText(UtilityDate.formatDate(calendar.getTime(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+                                        observableDate.set(calendar.getTime());
+                                    }, () -> {
+
+                                    })
+                                    .show(parentFragment.requireActivity().getSupportFragmentManager(), "tag");
+                        } else {
+                            view.setText(UtilityDate.formatDate(calendar.getTime(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+                            observableDate.set(calendar.getTime());
+                        }
+                    }
+                    else {
+                        view.setText("");
+                        observableDate.set(null);
+                    }
+                });
+
+                datePicker.show(parentFragment.requireActivity().getSupportFragmentManager(), "tag");
+            };
+
+            //Adding click-listener
+            view.setOnClickListener(onClick::run);
+            if (view.getParent() != null && view.getParent().getParent() != null && view.getParent().getParent() instanceof TextInputLayout) {
+                ((FrameLayout) view.getParent()).setOnClickListener(onClick::run);
+                ((TextInputLayout) view.getParent().getParent()).setOnClickListener(onClick::run);
+            }
+        }
+        Date newValue = observableDate.get();
+        view.setText(UtilityDate.formatDate(newValue, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+    }
+
     @BindingAdapter("binding")
     public static void bindAutoCompleteTextView(AutoCompleteTextView view, final BindableString bindableString) {
         Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -599,6 +723,12 @@ public class Converters {
     }
 
 
+    @BindingAdapter("reverse_visibility")
+    public static void bindViewReverseVisibility(View view, boolean bool) {
+        view.setVisibility(!bool ? View.VISIBLE : View.GONE);
+    }
+
+
     @BindingAdapter("android:layout_weight")
     public static void setLayoutWeight(View view, final Float weight) {
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/ViewConverters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/ViewConverters.java
index 9ade457e..04beded9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/ViewConverters.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/ViewConverters.java
@@ -2,11 +2,9 @@ package it.integry.integrywmsnative.core.di;
 
 import android.view.View;
 
-import androidx.appcompat.widget.AppCompatTextView;
-import androidx.core.util.Pair;
 import androidx.databinding.BindingAdapter;
 
-import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.OnMultipleClickListener;
 import it.integry.integrywmsnative.core.expansion.OnSingleClickListener;
 
 public class ViewConverters {
@@ -25,4 +23,16 @@ public class ViewConverters {
         });
     }
 
+    @BindingAdapter("multipleClick")
+    public static void bindViewMultipleClick(View view, final Runnable callback) {
+        view.setFocusable(true);
+        view.setClickable(true);
+        view.setOnClickListener(new OnMultipleClickListener() {
+            @Override
+            public void onSingleClick(View v) {
+                callback.run();
+            }
+        });
+    }
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
index c0123045..85e6c7cd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
@@ -1,11 +1,8 @@
 package it.integry.integrywmsnative.core.expansion;
 
-import android.content.Context;
-import android.util.AttributeSet;
+import android.os.Bundle;
 import android.view.KeyEvent;
-import android.view.View;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -23,17 +20,14 @@ public class BaseActivity extends AppCompatActivity {
 
     private boolean progressOpened;
 
-    @Nullable
     @Override
-    public View onCreateView(@Nullable View parent, @NonNull String name, @NonNull Context context, @NonNull AttributeSet attrs) {
-        var v = super.onCreateView(parent, name, context, attrs);
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
         MainApplication.appComponent
                 .baseActivityComponent()
                 .create()
                 .inject(this);
-
-        return v;
     }
 
     public void onLoadingStarted() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/OnMultipleClickListener.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/OnMultipleClickListener.java
new file mode 100644
index 00000000..5bbdceb3
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/OnMultipleClickListener.java
@@ -0,0 +1,59 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import android.view.View;
+
+
+/**
+ * Implementation of {@link View.OnClickListener} that ignores subsequent clicks that happen too quickly after the first one.<br/>
+ * To use this class, implement {@link #onSingleClick(View)} instead of {@link View.OnClickListener#onClick(View)}.
+ */
+public abstract class OnMultipleClickListener implements View.OnClickListener {
+    private static final String TAG = OnMultipleClickListener.class.getSimpleName();
+
+    private static final long MAX_DELAY_MS = 2000;
+
+    private long mLastClickTime;
+    private int mClickCounter = 0;
+
+    @Override
+    public final void onClick(View v) {
+        long now = System.currentTimeMillis();
+        long lastClickTime = mLastClickTime;
+        mLastClickTime = now;
+
+        if(now - lastClickTime > MAX_DELAY_MS) {
+            mClickCounter = 0;
+        }
+        mClickCounter++;
+
+        if (mClickCounter < 5) {
+            return;
+        }
+
+        onSingleClick(v);
+        mClickCounter = 0;
+    }
+
+    /**
+     * Called when a view has been clicked.
+     *
+     * @param v The view that was clicked.
+     */
+    public abstract void onSingleClick(View v);
+
+    /**
+     * Wraps an {@link View.OnClickListener} into an {@link OnMultipleClickListener}.<br/>
+     * The argument's {@link View.OnClickListener#onClick(View)} method will be called when a single click is registered.
+     *
+     * @param onClickListener The listener to wrap.
+     * @return the wrapped listener.a
+     */
+    public static View.OnClickListener wrap(final View.OnClickListener onClickListener) {
+        return new OnMultipleClickListener() {
+            @Override
+            public void onSingleClick(View v) {
+                onClickListener.onClick(v);
+            }
+        };
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/RunnableArgssWithReturn.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/RunnableArgssWithReturn.java
new file mode 100644
index 00000000..2f99a916
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/RunnableArgssWithReturn.java
@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.expansion;
+
+public interface RunnableArgssWithReturn<T, U, R> {
+
+    R run(T data1, U data2);
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/mapper/BaseMapper.java b/app/src/main/java/it/integry/integrywmsnative/core/mapper/BaseMapper.java
new file mode 100644
index 00000000..535cf608
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/mapper/BaseMapper.java
@@ -0,0 +1,33 @@
+package it.integry.integrywmsnative.core.mapper;
+
+import com.annimon.stream.Stream;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.BaseRoomDTO;
+import it.integry.integrywmsnative.core.model.BaseRestDTO;
+
+public abstract class BaseMapper<T extends BaseRestDTO, U extends BaseRoomDTO> {
+
+    public List<U> mapRestsToRooms(List<T> inputRestList) {
+        if(inputRestList == null) return null;
+
+        return Stream.of(inputRestList)
+                .map(this::mapRestToRoom)
+                .toList();
+    }
+
+    public abstract U mapRestToRoom(T inputData);
+
+
+    public List<T> mapRoomsToRests(List<U> inputRoomList) {
+        if(inputRoomList == null) return null;
+
+        return Stream.of(inputRoomList)
+                .map(this::mapRoomToRest)
+                .toList();
+    }
+
+    public abstract T mapRoomToRest(U inputData);
+
+}
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
new file mode 100644
index 00000000..038fad40
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioMapper.java
@@ -0,0 +1,70 @@
+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.model.MtbInvent;
+
+@Singleton
+public class InventarioMapper extends BaseMapper<MtbInvent, InventarioRoomDTO> {
+
+    private final InventarioRowMapper inventarioRowMapper;
+
+    public InventarioMapper(InventarioRowMapper inventarioRowMapper) {
+        this.inventarioRowMapper = inventarioRowMapper;
+    }
+
+    @Override
+    public InventarioRoomDTO mapRestToRoom(MtbInvent inputData) {
+        if(inputData == null) return null;
+
+        var data = new InventarioRoomDTO();
+        data.setIdInventario(inputData.getIdInventario());
+        data.setCodMdep(inputData.getCodMdep());
+        data.setDataInventario(inputData.getDataInventario());
+        data.setDataReg(inputData.getDataReg());
+        data.setDataVer(inputData.getDataVer());
+        data.setFiltro(inputData.getFiltro());
+        data.setFlagStato(inputData.getFlagStato());
+        data.setFlagOperazione(inputData.getFlagOperazione());
+        data.setCodAnag(inputData.getCodAnag());
+        data.setCodDtip(inputData.getCodDtip());
+        data.setInseritoDa(inputData.getInseritoDa());
+        data.setRegistratoDa(inputData.getRegistratoDa());
+        data.setVerificatoDa(inputData.getVerificatoDa());
+        data.setDataOraInizio(inputData.getDataOraInizio());
+        data.setDataOraFine(inputData.getDataOraFine());
+        data.setCausale(inputData.getCausale());
+
+        data.setInventarioRowList(inventarioRowMapper.mapRestsToRooms(inputData.getMtbInvenr()));
+
+        return data;
+    }
+
+    @Override
+    public MtbInvent mapRoomToRest(InventarioRoomDTO inputData) {
+        if(inputData == null) return null;
+
+        var data = new MtbInvent();
+        data.setIdInventario(inputData.getIdInventario());
+        data.setCodMdep(inputData.getCodMdep());
+        data.setDataInventario(inputData.getDataInventario());
+        data.setDataReg(inputData.getDataReg());
+        data.setDataVer(inputData.getDataVer());
+        data.setFiltro(inputData.getFiltro());
+        data.setFlagStato(inputData.getFlagStato());
+        data.setFlagOperazione(inputData.getFlagOperazione());
+        data.setCodAnag(inputData.getCodAnag());
+        data.setCodDtip(inputData.getCodDtip());
+        data.setInseritoDa(inputData.getInseritoDa());
+        data.setRegistratoDa(inputData.getRegistratoDa());
+        data.setVerificatoDa(inputData.getVerificatoDa());
+        data.setDataOraInizio(inputData.getDataOraInizio());
+        data.setDataOraFine(inputData.getDataOraFine());
+        data.setCausale(inputData.getCausale());
+
+        data.setMtbInvenr(inventarioRowMapper.mapRoomsToRests(inputData.getInventarioRowList()));
+
+        return data;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioRowMapper.java b/app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioRowMapper.java
new file mode 100644
index 00000000..f54b84c9
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioRowMapper.java
@@ -0,0 +1,37 @@
+package it.integry.integrywmsnative.core.mapper;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
+import it.integry.integrywmsnative.core.model.MtbInvenr;
+
+public class InventarioRowMapper extends BaseMapper<MtbInvenr, InventarioRowRoomDTO> {
+
+    @Override
+    public InventarioRowRoomDTO mapRestToRoom(MtbInvenr inputData) {
+        if(inputData == null) return null;
+
+        var data = new InventarioRowRoomDTO();
+        data.setCodMart(inputData.getCodMart());
+        data.setPartitaMag(inputData.getPartitaMag());
+        data.setQta(inputData.getQtaInv());
+        data.setNumConf(inputData.getNumConf());
+        data.setDataOraInv(inputData.getDataOraInv());
+        data.setScanCodBarre(inputData.getScanCodBarre());
+        data.setZona(inputData.getZona());
+        return data;
+    }
+
+    @Override
+    public MtbInvenr mapRoomToRest(InventarioRowRoomDTO inputData) {
+        if(inputData == null) return null;
+
+        var data = new MtbInvenr();
+        data.setCodMart(inputData.getCodMart());
+        data.setPartitaMag(inputData.getPartitaMag());
+        data.setQtaInv(inputData.getQta());
+        data.setNumConf(inputData.getNumConf());
+        data.setDataOraInv(inputData.getDataOraInv());
+        data.setScanCodBarre(inputData.getScanCodBarre());
+        data.setZona(inputData.getZona());
+        return data;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/BaseRestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/model/BaseRestDTO.java
new file mode 100644
index 00000000..a836419d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/BaseRestDTO.java
@@ -0,0 +1,4 @@
+package it.integry.integrywmsnative.core.model;
+
+public abstract class BaseRestDTO {
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/EntityBase.java b/app/src/main/java/it/integry/integrywmsnative/core/model/EntityBase.java
index 732682f0..487411b3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/EntityBase.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/EntityBase.java
@@ -2,7 +2,7 @@ package it.integry.integrywmsnative.core.model;
 
 import android.util.Log;
 
-public abstract class EntityBase implements Cloneable{
+public abstract class EntityBase extends BaseRestDTO implements Cloneable{
 
     public String operation;
     public String type;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbInvenr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbInvenr.java
new file mode 100644
index 00000000..2a62bb35
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbInvenr.java
@@ -0,0 +1,202 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+public class MtbInvenr extends EntityBase {
+
+    private Long idInventario;
+    private Integer idRiga;
+    private String codMdep;
+    private String codMart;
+    private String codCol;
+    private String codTagl;
+    private BigDecimal qtaInv;
+    private LocalDateTime dataOraInv;
+    private BigDecimal costoInv;
+    private BigDecimal giacenzaConf;
+    private BigDecimal giacenzaDb;
+    private String idDisp;
+    private Date dataCreate;
+    private BigDecimal numConf;
+    private String partitaMag;
+    private String scanCodBarre;
+    private String zona;
+    private Date dataInventario;
+    private String regolaCalcoloCosto;
+    private Date dataScadPartitaMag;
+    private MtbPartitaMag mtbPartitaMag;
+
+    public MtbInvenr() {
+        type = "mtb_invenr";
+    }
+
+    public Long getIdInventario() {
+        return idInventario;
+    }
+
+    public void setIdInventario(Long idInventario) {
+        this.idInventario = idInventario;
+    }
+
+    public Integer getIdRiga() {
+        return idRiga;
+    }
+
+    public void setIdRiga(Integer idRiga) {
+        this.idRiga = idRiga;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public void setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public void setCodMart(String codMart) {
+        this.codMart = codMart;
+    }
+
+    public String getCodCol() {
+        return codCol;
+    }
+
+    public void setCodCol(String codCol) {
+        this.codCol = codCol;
+    }
+
+    public String getCodTagl() {
+        return codTagl;
+    }
+
+    public void setCodTagl(String codTagl) {
+        this.codTagl = codTagl;
+    }
+
+    public BigDecimal getQtaInv() {
+        return qtaInv;
+    }
+
+    public void setQtaInv(BigDecimal qtaInv) {
+        this.qtaInv = qtaInv;
+    }
+
+    public LocalDateTime getDataOraInv() {
+        return dataOraInv;
+    }
+
+    public void setDataOraInv(LocalDateTime dataOraInv) {
+        this.dataOraInv = dataOraInv;
+    }
+
+    public BigDecimal getCostoInv() {
+        return costoInv;
+    }
+
+    public void setCostoInv(BigDecimal costoInv) {
+        this.costoInv = costoInv;
+    }
+
+    public BigDecimal getGiacenzaConf() {
+        return giacenzaConf;
+    }
+
+    public void setGiacenzaConf(BigDecimal giacenzaConf) {
+        this.giacenzaConf = giacenzaConf;
+    }
+
+    public BigDecimal getGiacenzaDb() {
+        return giacenzaDb;
+    }
+
+    public void setGiacenzaDb(BigDecimal giacenzaDb) {
+        this.giacenzaDb = giacenzaDb;
+    }
+
+    public String getIdDisp() {
+        return idDisp;
+    }
+
+    public void setIdDisp(String idDisp) {
+        this.idDisp = idDisp;
+    }
+
+    public Date getDataCreate() {
+        return dataCreate;
+    }
+
+    public void setDataCreate(Date dataCreate) {
+        this.dataCreate = dataCreate;
+    }
+
+    public BigDecimal getNumConf() {
+        return numConf;
+    }
+
+    public void setNumConf(BigDecimal numConf) {
+        this.numConf = numConf;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public void setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+    }
+
+    public String getScanCodBarre() {
+        return scanCodBarre;
+    }
+
+    public void setScanCodBarre(String scanCodBarre) {
+        this.scanCodBarre = scanCodBarre;
+    }
+
+    public String getZona() {
+        return zona;
+    }
+
+    public void setZona(String zona) {
+        this.zona = zona;
+    }
+
+    public Date getDataInventario() {
+        return dataInventario;
+    }
+
+    public void setDataInventario(Date dataInventario) {
+        this.dataInventario = dataInventario;
+    }
+
+    public String getRegolaCalcoloCosto() {
+        return regolaCalcoloCosto;
+    }
+
+    public void setRegolaCalcoloCosto(String regolaCalcoloCosto) {
+        this.regolaCalcoloCosto = regolaCalcoloCosto;
+    }
+
+    public Date getDataScadPartitaMag() {
+        return dataScadPartitaMag;
+    }
+
+    public void setDataScadPartitaMag(Date dataScadPartitaMag) {
+        this.dataScadPartitaMag = dataScadPartitaMag;
+    }
+
+    public MtbPartitaMag getMtbPartitaMag() {
+        return mtbPartitaMag;
+    }
+
+    public void setMtbPartitaMag(MtbPartitaMag mtbPartitaMag) {
+        this.mtbPartitaMag = mtbPartitaMag;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbInvent.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbInvent.java
new file mode 100644
index 00000000..93a54964
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbInvent.java
@@ -0,0 +1,230 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+public class MtbInvent extends EntityBase {
+
+    private Long idInventario;
+    private String codMdep;
+    private LocalDate dataInventario;
+    private LocalDateTime dataReg;
+    private LocalDateTime dataVer;
+    private String filtro;
+    private String flagStato;
+    private String flagOperazione;
+    private String codAnag;
+    private String codDtip;
+    private String inseritoDa;
+    private String registratoDa;
+    private String tipoGiacenza;
+    private String tipoVerifica;
+    private String verificatoDa;
+    private Date dataIns;
+    private Date dataDoc;
+    private String serDoc;
+    private Integer numDoc;
+    private String regolaCalcoloCosto;
+    private LocalDateTime dataOraInizio;
+    private LocalDateTime dataOraFine;
+    private String causale;
+    private List<MtbInvenr> mtbInvenr;
+
+    public MtbInvent() {
+        type = "mtb_invent";
+    }
+
+    public Long getIdInventario() {
+        return idInventario;
+    }
+
+    public void setIdInventario(Long idInventario) {
+        this.idInventario = idInventario;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public void setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+    }
+
+    public LocalDate getDataInventario() {
+        return dataInventario;
+    }
+
+    public void setDataInventario(LocalDate dataInventario) {
+        this.dataInventario = dataInventario;
+    }
+
+    public LocalDateTime getDataReg() {
+        return dataReg;
+    }
+
+    public void setDataReg(LocalDateTime dataReg) {
+        this.dataReg = dataReg;
+    }
+
+    public LocalDateTime getDataVer() {
+        return dataVer;
+    }
+
+    public void setDataVer(LocalDateTime dataVer) {
+        this.dataVer = dataVer;
+    }
+
+    public String getFiltro() {
+        return filtro;
+    }
+
+    public void setFiltro(String filtro) {
+        this.filtro = filtro;
+    }
+
+    public String getFlagStato() {
+        return flagStato;
+    }
+
+    public void setFlagStato(String flagStato) {
+        this.flagStato = flagStato;
+    }
+
+    public String getFlagOperazione() {
+        return flagOperazione;
+    }
+
+    public void setFlagOperazione(String flagOperazione) {
+        this.flagOperazione = flagOperazione;
+    }
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public void setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+    }
+
+    public String getCodDtip() {
+        return codDtip;
+    }
+
+    public void setCodDtip(String codDtip) {
+        this.codDtip = codDtip;
+    }
+
+    public String getInseritoDa() {
+        return inseritoDa;
+    }
+
+    public void setInseritoDa(String inseritoDa) {
+        this.inseritoDa = inseritoDa;
+    }
+
+    public String getRegistratoDa() {
+        return registratoDa;
+    }
+
+    public void setRegistratoDa(String registratoDa) {
+        this.registratoDa = registratoDa;
+    }
+
+    public String getTipoGiacenza() {
+        return tipoGiacenza;
+    }
+
+    public void setTipoGiacenza(String tipoGiacenza) {
+        this.tipoGiacenza = tipoGiacenza;
+    }
+
+    public String getTipoVerifica() {
+        return tipoVerifica;
+    }
+
+    public void setTipoVerifica(String tipoVerifica) {
+        this.tipoVerifica = tipoVerifica;
+    }
+
+    public String getVerificatoDa() {
+        return verificatoDa;
+    }
+
+    public void setVerificatoDa(String verificatoDa) {
+        this.verificatoDa = verificatoDa;
+    }
+
+    public Date getDataIns() {
+        return dataIns;
+    }
+
+    public void setDataIns(Date dataIns) {
+        this.dataIns = dataIns;
+    }
+
+    public Date getDataDoc() {
+        return dataDoc;
+    }
+
+    public void setDataDoc(Date dataDoc) {
+        this.dataDoc = dataDoc;
+    }
+
+    public String getSerDoc() {
+        return serDoc;
+    }
+
+    public void setSerDoc(String serDoc) {
+        this.serDoc = serDoc;
+    }
+
+    public Integer getNumDoc() {
+        return numDoc;
+    }
+
+    public void setNumDoc(Integer numDoc) {
+        this.numDoc = numDoc;
+    }
+
+    public String getRegolaCalcoloCosto() {
+        return regolaCalcoloCosto;
+    }
+
+    public void setRegolaCalcoloCosto(String regolaCalcoloCosto) {
+        this.regolaCalcoloCosto = regolaCalcoloCosto;
+    }
+
+    public LocalDateTime getDataOraInizio() {
+        return dataOraInizio;
+    }
+
+    public void setDataOraInizio(LocalDateTime dataOraInizio) {
+        this.dataOraInizio = dataOraInizio;
+    }
+
+    public LocalDateTime getDataOraFine() {
+        return dataOraFine;
+    }
+
+    public void setDataOraFine(LocalDateTime dataOraFine) {
+        this.dataOraFine = dataOraFine;
+    }
+
+    public String getCausale() {
+        return causale;
+    }
+
+    public void setCausale(String causale) {
+        this.causale = causale;
+    }
+
+    public List<MtbInvenr> getMtbInvenr() {
+        return mtbInvenr;
+    }
+
+    public void setMtbInvenr(List<MtbInvenr> mtbInvenr) {
+        this.mtbInvenr = mtbInvenr;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/secondary/GestioneEnum.java b/app/src/main/java/it/integry/integrywmsnative/core/model/secondary/GestioneEnum.java
index b063f094..e5d4d9db 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/secondary/GestioneEnum.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/secondary/GestioneEnum.java
@@ -7,7 +7,7 @@ public enum GestioneEnum {
     LAVORAZIONE("L"),
     VENDITA("V");
 
-    private String text;
+    private final String text;
     GestioneEnum(String text) {
         this.text = text;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpLoggerInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpLoggerInterceptor.java
new file mode 100644
index 00000000..fb0550ed
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpLoggerInterceptor.java
@@ -0,0 +1,50 @@
+package it.integry.integrywmsnative.core.rest;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+import it.integry.integrywmsnative.core.utility.UtilityLogger;
+import okhttp3.HttpUrl;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.BufferedSource;
+
+/**
+ * Created by GiuseppeS on 06/03/2018.
+ */
+
+public class HttpLoggerInterceptor implements Interceptor {
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        final Request request = chain.request();
+        final HttpUrl url = request.url();
+
+        UtilityLogger.info("Logging request: [" + url + "]");
+
+        if (request.body() != null) {
+            var buffer = new Buffer();
+            request.body().writeTo(buffer);
+
+            UtilityLogger.info(buffer.readUtf8());
+        }
+
+        var response = chain.proceed(chain.request());
+
+        if (response.body() != null) {
+            ResponseBody responseBody = response.body();
+            BufferedSource source = responseBody.source();
+            source.request(Long.MAX_VALUE); // request the entire body.
+            Buffer buffer = source.getBuffer();
+// clone buffer before reading from it
+            String responseBodyString = buffer.clone().readString(Charset.forName("UTF-8"));
+            UtilityLogger.info(responseBodyString);
+
+        }
+
+        return response;
+    }
+}
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 f367c89a..3def3811 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
@@ -4,8 +4,14 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 import java.lang.reflect.Modifier;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.concurrent.TimeUnit;
 
+import it.integry.integrywmsnative.core.rest.deserializer.LocalDateDeserializer;
+import it.integry.integrywmsnative.core.rest.deserializer.LocalDateTimeDeserializer;
+import it.integry.integrywmsnative.core.rest.serializer.LocalDateSerializer;
+import it.integry.integrywmsnative.core.rest.serializer.LocalDateTimeSerializer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
@@ -17,6 +23,8 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 public class RESTBuilder {
 
+    private static final boolean ADD_LOGGER_INTERCEPTOR = false;
+
     public static <T> T getService(final Class<T> service) {
         return getService(service, SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true);
 
@@ -45,6 +53,7 @@ public class RESTBuilder {
         clientBuilder.retryOnConnectionFailure(true);
 
         if (addInterceptors) clientBuilder.addInterceptor(new HttpInterceptor());
+        if (ADD_LOGGER_INTERCEPTOR) clientBuilder.addInterceptor(new HttpLoggerInterceptor());
 
         OkHttpClient client = clientBuilder.build();
 
@@ -52,6 +61,10 @@ public class RESTBuilder {
 
         Gson gson = new GsonBuilder()
                 .setDateFormat("dd/MM/yyyy HH:mm:ss")
+                .registerTypeAdapter(LocalDate.class, new LocalDateDeserializer())
+                .registerTypeAdapter(LocalDate.class, new LocalDateSerializer())
+                .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeDeserializer())
+                .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
                 .excludeFieldsWithModifiers(Modifier.TRANSIENT)
                 .create();
 
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
new file mode 100644
index 00000000..b994b3db
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/AziendaRESTConsumer.java
@@ -0,0 +1,31 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+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.model.ServiceRESTResponse;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+@Singleton
+public class AziendaRESTConsumer extends _BaseRESTConsumer {
+
+    public void retrieveAzienda(RunnableArgs<Azienda> onComplete, RunnableArgs<Exception> onFailed) {
+        AziendaRESTConsumerService aziendaRESTConsumerService = RESTBuilder.getService(AziendaRESTConsumerService.class);
+        aziendaRESTConsumerService.retrieveDefaultAzienda().enqueue(new Callback<>() {
+            @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));
+            }
+        });
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/AziendaRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/AziendaRESTConsumerService.java
new file mode 100644
index 00000000..dfc09716
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/AziendaRESTConsumerService.java
@@ -0,0 +1,13 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import it.integry.integrywmsnative.core.model.Azienda;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import retrofit2.Call;
+import retrofit2.http.GET;
+
+public interface AziendaRESTConsumerService {
+
+    @GET("defaultAzienda")
+    Call<ServiceRESTResponse<Azienda>> retrieveDefaultAzienda();
+
+}
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 a55fb81f..58421651 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
@@ -332,7 +332,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                     if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
                         List<MtbColt> mtbColtList = new ArrayList<>();
                         mtbColtList.add(mtbColt);
-                        fillMtbAartsOfMtbColtsStatic(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
+                        fillMtbAartsOfMtbColts(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
                     } else {
                         onComplete.run(mtbColt);
                     }
@@ -350,7 +350,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     public void fillMtbAartsOfMtbColts(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         fillMtbAartsOfMtbColtsStatic(mtbColts, onComplete, onFailed);
     }
-
     public static void fillMtbAartsOfMtbColtsStatic(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         List<String> codMarts = new ArrayList<>();
 
@@ -432,7 +431,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                     if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
                         List<MtbColt> mtbColtList = new ArrayList<>();
                         mtbColtList.add(mtbColt);
-                        fillMtbAartsOfMtbColtsStatic(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
+                        fillMtbAartsOfMtbColts(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
                     } else {
                         onComplete.run(mtbColt);
                     }
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 78ad94f1..acd1f047 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
@@ -78,7 +78,7 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public static void getValues(String codMdep, List<StbGestSetup> stbGestSetupList, RunnableArgs<List<StbGestSetup>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getValues(String codMdep, List<StbGestSetup> stbGestSetupList, RunnableArgs<List<StbGestSetup>> onComplete, RunnableArgs<Exception> onFailed) {
         GestSetupRESTConsumerService service = RESTBuilder.getService(GestSetupRESTConsumerService.class);
         service.getGestSetupValues(codMdep, stbGestSetupList).enqueue(new Callback<>() {
             @Override
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
new file mode 100644
index 00000000..03f1e646
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/InventarioRESTConsumer.java
@@ -0,0 +1,77 @@
+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.MtbInvent;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+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 {
+
+
+    public void loadInventario(long inventoryId, RunnableArgs<RetrieveInventarioResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        var inventarioRESTConsumerService = RESTBuilder.getService(InventarioRESTConsumerService.class);
+        inventarioRESTConsumerService.retrieve(inventoryId)
+                .enqueue(new Callback<>() {
+                    @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 loadInventarioArts(long inventoryId, RunnableArgs<RetrieveInventarioArtsResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        var inventarioRESTConsumerService = RESTBuilder.getService(InventarioRESTConsumerService.class);
+        inventarioRESTConsumerService.retrieveArts(inventoryId)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<RetrieveInventarioArtsResponseDTO>> call, @NonNull Response<ServiceRESTResponse<RetrieveInventarioArtsResponseDTO>> response) {
+                        analyzeAnswer(response, "loadInventario", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<RetrieveInventarioArtsResponseDTO>> call, @NonNull Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+
+    public void makeInsertRequest(MtbInvent inventarioToInsert, final Runnable onComplete, final RunnableArgs<Exception> onFailed) {
+        var request = new InsertInventarioRequestDTO()
+                .setMtbInvent(inventarioToInsert);
+
+        var inventarioRESTConsumerService = RESTBuilder.getService(InventarioRESTConsumerService.class);
+        inventarioRESTConsumerService
+                        .insert(inventarioToInsert.getIdInventario(), request)
+                        .enqueue(new Callback<>() {
+                            @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));
+                            }
+                        });
+
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/InventarioRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/InventarioRESTConsumerService.java
new file mode 100644
index 00000000..5054be1a
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/InventarioRESTConsumerService.java
@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+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.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
+
+public interface InventarioRESTConsumerService {
+
+    @GET("wms/inventario/{inventoryId}")
+    Call<ServiceRESTResponse<RetrieveInventarioResponseDTO>> retrieve(
+            @Path("inventoryId") long inventoryId);
+
+    @POST("wms/inventario/{inventoryId}")
+    Call<ServiceRESTResponse<Void>> insert(
+            @Path("inventoryId") long inventoryId,
+            @Body InsertInventarioRequestDTO insertInventarioRequestDTO);
+
+    @GET("wms/inventario/{inventoryId}/arts")
+    Call<ServiceRESTResponse<RetrieveInventarioArtsResponseDTO>> retrieveArts(
+            @Path("inventoryId") long inventoryId);
+}
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 165e2a5a..b1b976ea 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
@@ -12,7 +12,6 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -21,61 +20,34 @@ import retrofit2.Response;
 @Singleton
 public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
 
+    private final SystemRESTConsumer mSystemRESTConsumer;
 
-
-    public void getTipoCollo(String codTcol, RunnableArgs<MtbTCol> onComplete, RunnableArgs<Exception> onFailed) {
-        String baseSql = "SELECT * " +
-                "FROM mtb_tcol " +
-                "WHERE cod_tcol = " + UtilityDB.valueToString(codTcol);
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbTCol>>() {}.getType();
-        SystemRESTConsumer.processSqlStatic(baseSql, typeOfObjectsList, new ISimpleOperationCallback<List<MtbTCol>>() {
-            @Override
-            public void onSuccess(List<MtbTCol> values) {
-                if(onComplete != null) {
-                    MtbTCol value = values != null && values.size() > 0 ? values.get(0) : null;
-                    onComplete.run(value);
-                }
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                if(onFailed != null) onFailed.run(ex);
-            }
-        });
+    public MagazzinoRESTConsumer(SystemRESTConsumer mSystemRESTConsumer) {
+        this.mSystemRESTConsumer = mSystemRESTConsumer;
     }
 
+
     public void getTipiCollo(RunnableArgs<List<MtbTCol>> onComplete, RunnableArgs<Exception> onFailed) {
-        getTipiColloStatic(onComplete, onFailed);
-    }
-
-    public static void getTipiColloStatic(RunnableArgs<List<MtbTCol>> onComplete, RunnableArgs<Exception> onFailed) {
         String baseSql = "SELECT * " +
                 "FROM mtb_tcol ";
 
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbTCol>>() {}.getType();
-        SystemRESTConsumer.processSqlStatic(baseSql, typeOfObjectsList, new ISimpleOperationCallback<List<MtbTCol>>() {
-            @Override
-            public void onSuccess(List<MtbTCol> values) {
-                if(onComplete != null) {
-                    onComplete.run(values);
-                }
-            }
+        Type typeOfObjectsList = new TypeToken<ArrayList<MtbTCol>>() {
+        }.getType();
 
-            @Override
-            public void onFailed(Exception ex) {
-                if(onFailed != null) onFailed.run(ex);
+        mSystemRESTConsumer.<ArrayList<MtbTCol>>processSql(baseSql, typeOfObjectsList, values -> {
+            if (onComplete != null) {
+                onComplete.run(values);
             }
+        }, ex -> {
+            if (onFailed != null) onFailed.run(ex);
         });
     }
 
 
-
-
-    public <T> void saveTerminalino(SaveDTO saveDTO, RunnableArgs<T> onComplete, RunnableArgs<Exception> onFailed){
+    public <T> void saveTerminalino(SaveDTO saveDTO, RunnableArgs<T> onComplete, RunnableArgs<Exception> onFailed) {
         MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class);
         service.<T>saveTerminalino(saveDTO)
-                .enqueue(new Callback<ServiceRESTResponse<T>>() {
+                .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<T>> call, Response<ServiceRESTResponse<T>> response) {
                         analyzeAnswer(response, "saveTerminalino", onComplete, onFailed);
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 1a3aad17..25cf1d01 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
@@ -19,7 +19,7 @@ import retrofit2.Callback;
 import retrofit2.Response;
 
 @Singleton
-public class PosizioniRESTConsumer extends _BaseRESTConsumer{
+public class PosizioniRESTConsumer extends _BaseRESTConsumer {
 
     private final SystemRESTConsumer mSystemRESTConsumer;
 
@@ -27,29 +27,7 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer{
         this.mSystemRESTConsumer = systemRESTConsumer;
     }
 
-    public void getPosizioneFromString(String posizione, RunnableArgs<MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
-        String sql = "SELECT TOP 1 mtb_depo_posizioni.*," +
-                " CASE WHEN jtb_fasi.cod_jfas IS NULL THEN 'N' ELSE 'S' END AS flag_linea_produzione " +
-                " FROM mtb_depo_posizioni " +
-                " LEFT OUTER JOIN jtb_fasi " +
-                " ON mtb_depo_posizioni.posizione = jtb_fasi.cod_jfas " +
-                " WHERE posizione = " + UtilityDB.valueToString(posizione);
-
-        SystemRESTConsumer.processSqlStatic(sql, MtbDepoPosizione.class, new ISimpleOperationCallback<MtbDepoPosizione>() {
-            @Override
-            public void onSuccess(MtbDepoPosizione value) {
-                if(onComplete != null) onComplete.run(value);
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                if(onFailed != null) onFailed.run(ex);
-            }
-        });
-    }
-
-    public static void getAvailablePosizioni(RunnableArgs<List<MtbDepoPosizione>> onComplete, RunnableArgs<Exception> onFailed) {
-//        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+    public void getAvailablePosizioni(RunnableArgs<List<MtbDepoPosizione>> onComplete, RunnableArgs<Exception> onFailed) {
         String codMdep = null;
 
         PosizioniRESTConsumerService posizioniRESTConsumerService = RESTBuilder.getService(PosizioniRESTConsumerService.class);
@@ -70,20 +48,19 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer{
 
 
     public void getBancaliInPosizione(MtbDepoPosizione mtbDepoPosizione, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
-        String sql = "SELECT * FROM mtb_colt WHERE segno > 0 AND cod_mdep = " + UtilityDB.valueToString(mtbDepoPosizione.getCodMdep()) + " AND posizione = " + UtilityDB.valueToString(mtbDepoPosizione.getPosizione());
+        String sql = "SELECT * FROM mtb_colt " +
+                "WHERE segno > 0 " +
+                "AND cod_mdep = " + UtilityDB.valueToString(mtbDepoPosizione.getCodMdep()) + " " +
+                "AND posizione = " + UtilityDB.valueToString(mtbDepoPosizione.getPosizione());
 
 
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {}.getType();
-        SystemRESTConsumer.processSqlStatic(sql, typeOfObjectsList, new ISimpleOperationCallback<List<MtbColt>>() {
-            @Override
-            public void onSuccess(List<MtbColt> value) {
-                if(onComplete != null) onComplete.run(value);
-            }
+        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {
+        }.getType();
 
-            @Override
-            public void onFailed(Exception ex) {
-                if(onFailed != null) onFailed.run(ex);
-            }
+        mSystemRESTConsumer.<ArrayList<MtbColt>>processSql(sql, typeOfObjectsList, value -> {
+            if (onComplete != null) onComplete.run(value);
+        }, ex -> {
+            if (onFailed != null) onFailed.run(ex);
         });
 
     }
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 8b0d8bd5..f9d81216 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
@@ -7,7 +7,6 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonParseException;
-import com.google.gson.reflect.TypeToken;
 import com.orhanobut.logger.Logger;
 
 import java.io.ByteArrayInputStream;
@@ -16,7 +15,6 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.Type;
 import java.net.ConnectException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -26,7 +24,6 @@ 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.model.Azienda;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
@@ -34,7 +31,6 @@ import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -43,8 +39,7 @@ import retrofit2.Response;
 @Singleton
 public class SystemRESTConsumer extends _BaseRESTConsumer {
 
-    public static <T> void processSqlStatic(String nativeSql, final Type clazz, RunnableArgs<T> onComplete, RunnableArgs<Exception> onFailed) {
-
+    public <T> void processSql(String nativeSql, final Type clazz, final RunnableArgs<T> onComplete, final RunnableArgs<Exception> onFailed) {
         NativeSqlRequestDTO nativeSqlDTO = new NativeSqlRequestDTO();
         nativeSqlDTO.nativeSql = nativeSql;
 
@@ -86,49 +81,10 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
                             onFailed.run(new Exception(t));
                     }
                 });
-
-    }
-
-    public static <T> void processSqlStatic(String nativeSql, final Type clazz, final ISimpleOperationCallback<T> callback) {
-
-        processSqlStatic(nativeSql, clazz, data -> {
-            callback.onSuccess((T) data);
-        }, callback::onFailed);
-
-    }
-
-    public <T> void processSql(String nativeSql, final Type clazz, final RunnableArgs<T> onComplete, final RunnableArgs<Exception> onFailed) {
-        processSqlStatic(nativeSql, clazz, onComplete, onFailed);
-    }
-
-
-    public static void getAvailableProfiles(final RunnableArgs<List<String>> onSuccess, RunnableArgs<Exception> onFailed) {
-
-        SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class);
-        service.getAvailableProfiles(SettingsManager.i().getUser().getUsername(), SettingsManager.i().getUser().getPassword()).enqueue(new Callback<ServiceRESTResponse<List<String>>>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<List<String>>> call, Response<ServiceRESTResponse<List<String>>> response) {
-                analyzeAnswer(response, "ProfilesAvailable", onSuccess, onFailed);
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<List<String>>> call, final Throwable t) {
-                Log.e("ProfilesAvailable", t.toString());
-                onFailed.run(new Exception(t));
-                UtilityLogger.error(new Exception(t));
-            }
-        });
-
-
     }
 
 
     public void getAvailableCodMdeps(final RunnableArgs<List<AvailableCodMdepsDTO>> onSuccess, RunnableArgs<Exception> onFailed) {
-        getAvailableCodMdepsStatic(onSuccess, onFailed);
-    }
-
-    public static void getAvailableCodMdepsStatic(final RunnableArgs<List<AvailableCodMdepsDTO>> onSuccess, RunnableArgs<Exception> onFailed) {
-
         SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class);
         service.getAvailableCodMdeps().enqueue(new Callback<>() {
             @Override
@@ -197,24 +153,4 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-
-    public static void getAzienda(RunnableArgs<Azienda> onComplete, RunnableArgs<Exception> onFailed) {
-
-        String sql = "SELECT TOP 1 * FROM azienda";
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<Azienda>>() {
-        }.getType();
-        SystemRESTConsumer.processSqlStatic(sql, typeOfObjectsList, new ISimpleOperationCallback<List<Azienda>>() {
-            @Override
-            public void onSuccess(List<Azienda> value) {
-                if (onComplete != null) onComplete.run(value.get(0));
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                if (onFailed != null) onFailed.run(ex);
-            }
-        });
-
-    }
 }
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
new file mode 100644
index 00000000..5570f9ba
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java
@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.deserializer;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+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> {
+
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
+
+
+    @Override
+    public LocalDate deserialize(JsonElement element, Type arg1, JsonDeserializationContext arg2) throws JsonParseException {
+        String date = element.getAsString();
+        if (UtilityString.isNullOrEmpty(date)) return null;
+
+        return LocalDate.parse(date, formatter);
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateTimeDeserializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateTimeDeserializer.java
new file mode 100644
index 00000000..c2683ea5
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateTimeDeserializer.java
@@ -0,0 +1,26 @@
+package it.integry.integrywmsnative.core.rest.deserializer;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+import java.lang.reflect.Type;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+import it.integry.integrywmsnative.core.utility.UtilityString;
+
+public class LocalDateTimeDeserializer implements JsonDeserializer<LocalDateTime> {
+
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm:ss");
+
+
+    @Override
+    public LocalDateTime deserialize(JsonElement element, Type arg1, JsonDeserializationContext arg2) throws JsonParseException {
+        String date = element.getAsString();
+        if (UtilityString.isNullOrEmpty(date)) return null;
+
+        return LocalDateTime.parse(date, formatter);
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/inventario/InsertInventarioRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/inventario/InsertInventarioRequestDTO.java
new file mode 100644
index 00000000..df3d3b0f
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/inventario/InsertInventarioRequestDTO.java
@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.core.rest.model.inventario;
+
+import it.integry.integrywmsnative.core.model.MtbInvent;
+
+public class InsertInventarioRequestDTO {
+
+    private MtbInvent mtbInvent;
+
+    public MtbInvent getMtbInvent() {
+        return mtbInvent;
+    }
+
+    public InsertInventarioRequestDTO setMtbInvent(MtbInvent mtbInvent) {
+        this.mtbInvent = mtbInvent;
+        return this;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/inventario/InventarioArtDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/inventario/InventarioArtDTO.java
new file mode 100644
index 00000000..d6561e6d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/inventario/InventarioArtDTO.java
@@ -0,0 +1,123 @@
+package it.integry.integrywmsnative.core.rest.model.inventario;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbAart;
+
+public class InventarioArtDTO {
+
+    private String codMart;
+    private String descrizione;
+    private String untMis;
+    private BigDecimal qtaCnf;
+    private List<String> barcode;
+    private boolean flagTracciabilita;
+    private boolean flagQtaCnfFissa;
+    private BigDecimal giacenza;
+    private boolean plu;
+    private BigDecimal przVendIva;
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public InventarioArtDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public InventarioArtDTO setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public InventarioArtDTO setUntMis(String untMis) {
+        this.untMis = untMis;
+        return this;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public InventarioArtDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public List<String> getBarcode() {
+        return barcode;
+    }
+
+    public InventarioArtDTO setBarcode(List<String> barcode) {
+        this.barcode = barcode;
+        return this;
+    }
+
+    public boolean isFlagTracciabilita() {
+        return flagTracciabilita;
+    }
+
+    public InventarioArtDTO setFlagTracciabilita(boolean flagTracciabilita) {
+        this.flagTracciabilita = flagTracciabilita;
+        return this;
+    }
+
+    public boolean isFlagQtaCnfFissa() {
+        return flagQtaCnfFissa;
+    }
+
+    public InventarioArtDTO setFlagQtaCnfFissa(boolean flagQtaCnfFissa) {
+        this.flagQtaCnfFissa = flagQtaCnfFissa;
+        return this;
+    }
+
+    public BigDecimal getGiacenza() {
+        return giacenza;
+    }
+
+    public InventarioArtDTO setGiacenza(BigDecimal giacenza) {
+        this.giacenza = giacenza;
+        return this;
+    }
+
+    public boolean isPlu() {
+        return plu;
+    }
+
+    public InventarioArtDTO setPlu(boolean plu) {
+        this.plu = plu;
+        return this;
+    }
+
+    public BigDecimal getPrzVendIva() {
+        return przVendIva;
+    }
+
+    public InventarioArtDTO setPrzVendIva(BigDecimal przVendIva) {
+        this.przVendIva = przVendIva;
+        return this;
+    }
+
+    public MtbAart toMtbAart() {
+        return new MtbAart()
+                .setCodMart(getCodMart())
+                .setDescrizione(getDescrizione())
+                .setDescrizioneEstesa(getDescrizione())
+                .setBarCode(!getBarcode().isEmpty() ? getBarcode().get(0) : null)
+                .setUntMis(getUntMis())
+                .setQtaCnf(getQtaCnf())
+                .setPlu(isPlu() ? "S" : "N")
+                .setFlagTracciabilita(isFlagTracciabilita() ? "S" : "N")
+                .setFlagQtaCnfFissa(isFlagQtaCnfFissa() ? "S" : "N");
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/inventario/RetrieveInventarioArtsResponseDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/inventario/RetrieveInventarioArtsResponseDTO.java
new file mode 100644
index 00000000..39db421d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/inventario/RetrieveInventarioArtsResponseDTO.java
@@ -0,0 +1,13 @@
+package it.integry.integrywmsnative.core.rest.model.inventario;
+
+import java.util.List;
+
+public class RetrieveInventarioArtsResponseDTO {
+
+    private List<InventarioArtDTO> arts;
+
+    public List<InventarioArtDTO> getArts() {
+        return arts;
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/inventario/RetrieveInventarioResponseDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/inventario/RetrieveInventarioResponseDTO.java
new file mode 100644
index 00000000..034a03bd
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/inventario/RetrieveInventarioResponseDTO.java
@@ -0,0 +1,12 @@
+package it.integry.integrywmsnative.core.rest.model.inventario;
+
+import it.integry.integrywmsnative.core.model.MtbInvent;
+
+public class RetrieveInventarioResponseDTO {
+
+    private MtbInvent mtbInvent;
+
+    public MtbInvent getMtbInvent() {
+        return mtbInvent;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/LocalDateSerializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/LocalDateSerializer.java
new file mode 100644
index 00000000..2ee005ca
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/LocalDateSerializer.java
@@ -0,0 +1,21 @@
+package it.integry.integrywmsnative.core.rest.serializer;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+import java.time.LocalDate;
+
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class LocalDateSerializer implements JsonSerializer<LocalDate> {
+
+    @Override
+    public JsonElement serialize(LocalDate src, Type typeOfSrc, JsonSerializationContext context) {
+        String dateString = UtilityDate.formatDate(src, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+
+        return src == null ? null : new JsonPrimitive(dateString);
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/LocalDateTimeSerializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/LocalDateTimeSerializer.java
new file mode 100644
index 00000000..28af20f9
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/LocalDateTimeSerializer.java
@@ -0,0 +1,21 @@
+package it.integry.integrywmsnative.core.rest.serializer;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+import java.time.LocalDateTime;
+
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class LocalDateTimeSerializer implements JsonSerializer<LocalDateTime> {
+
+    @Override
+    public JsonElement serialize(LocalDateTime src, Type typeOfSrc, JsonSerializationContext context) {
+        String dateString = UtilityDate.formatDate(src, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
+
+        return src == null ? null : new JsonPrimitive(dateString);
+    }
+}
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 8f4f299e..748aa1eb 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
@@ -133,15 +133,6 @@ public class DBSettingsModel {
         return this;
     }
 
-    public String getDefaultCausaleRettificaGiacenze() {
-        return defaultCausaleRettificaGiacenze;
-    }
-
-    public DBSettingsModel setDefaultCausaleRettificaGiacenze(String defaultCausaleRettificaGiacenze) {
-        this.defaultCausaleRettificaGiacenze = defaultCausaleRettificaGiacenze;
-        return this;
-    }
-
     public DistribuzioneColloDTO.CriterioDistribuzione getDefaultCriterioDistribuzione() {
         return defaultCriterioDistribuzione;
     }
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 6ad366f1..f5b616a8 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
@@ -12,16 +12,20 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import javax.inject.Singleton;
+
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.StbGestSetup;
 import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
+import it.integry.integrywmsnative.core.rest.consumers.AziendaRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.utility.UtilityFirebase;
 
+@Singleton
 public class SettingsManager {
 
     private static String TAG = "SETTINGS";
@@ -32,10 +36,24 @@ public class SettingsManager {
     private static boolean firstStart = false;
 
     private static Context mContext;
+    private static SystemRESTConsumer mSystemRESTConsumer;
+    private static AziendaRESTConsumer mAziendaRESTConsumer;
+    private static GestSetupRESTConsumer mGestSetupRESTConsumer;
+    private static PosizioniRESTConsumer mPosizioniRESTConsumer;
 
-    public static void init(Context context) {
+    public SettingsManager(Context context,
+                           SystemRESTConsumer systemRESTConsumer,
+                           AziendaRESTConsumer aziendaRESTConsumer,
+                           GestSetupRESTConsumer gestSetupRESTConsumer,
+                           PosizioniRESTConsumer posizioniRESTConsumer) {
         mContext = context;
+        mSystemRESTConsumer = systemRESTConsumer;
+        mAziendaRESTConsumer = aziendaRESTConsumer;
+        mGestSetupRESTConsumer = gestSetupRESTConsumer;
+        mPosizioniRESTConsumer = posizioniRESTConsumer;
+    }
 
+    public void init() {
         settingsModelIstance = (SettingsModel) Stash.getObject(TAG, SettingsModel.class);
 
         if (settingsModelIstance == null) {
@@ -52,6 +70,11 @@ public class SettingsManager {
 
     }
 
+    public SettingsModel getSettings() {
+        return settingsModelIstance;
+    }
+
+
     public static SettingsModel i() {
         return settingsModelIstance;
     }
@@ -110,7 +133,7 @@ public class SettingsManager {
 
     private static void loadDatiAzienda(Runnable onComplete, RunnableArgs<Exception> onFailed) {
 
-        SystemRESTConsumer.getAzienda(datiAzienda -> {
+        mAziendaRESTConsumer.retrieveAzienda(datiAzienda -> {
             SettingsManager.iDB().setDatiAzienda(datiAzienda);
 
             if (!SettingsManager.iDB().isFlagUseCodAnagAziendale()) {
@@ -128,7 +151,7 @@ public class SettingsManager {
 
             Type type = new TypeToken<List<InternalCodAnagsDTO>>() {
             }.getType();
-            SystemRESTConsumer.<List<InternalCodAnagsDTO>>processSqlStatic(internalCodAnagsQuery, type, internalCodAnagsList -> {
+            mSystemRESTConsumer.<List<InternalCodAnagsDTO>>processSql(internalCodAnagsQuery, type, internalCodAnagsList -> {
                 SettingsManager.iDB().setInternalCodAnags(internalCodAnagsList);
 
                 if (onComplete != null) onComplete.run();
@@ -137,20 +160,8 @@ public class SettingsManager {
         }, onFailed);
     }
 
-    private static void loadAvailableProfiles(Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        SystemRESTConsumer.getAvailableProfiles(availableProfiles -> {
-            dbSettingsModelIstance.setAvailableProfiles(availableProfiles);
-
-            onComplete.run();
-
-        }, ex -> {
-            //BOH
-            if (onFailed != null) onFailed.run(ex);
-        });
-    }
-
     private static void loadAvailableCodMdeps(Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        SystemRESTConsumer.getAvailableCodMdepsStatic(availableCodMdeps -> {
+        mSystemRESTConsumer.getAvailableCodMdeps(availableCodMdeps -> {
             dbSettingsModelIstance.setAvailableCodMdep(availableCodMdeps);
 
             if (availableCodMdeps == null || availableCodMdeps.size() == 0) {
@@ -183,7 +194,7 @@ public class SettingsManager {
 
 
     private static void loadAvailablePosizioni(Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        PosizioniRESTConsumer.getAvailablePosizioni(availablePosizioni -> {
+        mPosizioniRESTConsumer.getAvailablePosizioni(availablePosizioni -> {
                     dbSettingsModelIstance.setAvailablePosizioni(availablePosizioni);
 
                     if (onComplete != null) onComplete.run();
@@ -198,10 +209,6 @@ public class SettingsManager {
 
         List<StbGestSetup> stbGestSetupList = new ArrayList<>();
 
-        stbGestSetupList.add(new StbGestSetup()
-                .setGestName("PICKING")
-                .setSection("SETUP")
-                .setKeySection("DEFAULT_CAUSALE_RETTIFICA_GIACENZE"));
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PICKING")
                 .setSection("SETUP")
@@ -336,8 +343,7 @@ public class SettingsManager {
                 .setKeySection("FLAG_NOTIFICA_STATO_PARTITA"));
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
-        GestSetupRESTConsumer.getValues(codMdep, stbGestSetupList, list -> {
-            dbSettingsModelIstance.setDefaultCausaleRettificaGiacenze(getValueFromList(list, "SETUP", "DEFAULT_CAUSALE_RETTIFICA_GIACENZE", String.class));
+        mGestSetupRESTConsumer.getValues(codMdep, stbGestSetupList, list -> {
             dbSettingsModelIstance.setEnableCheckPartitaMagCheckPickingV(getValueFromList(list, "SETUP", "ENABLE_CHECK_PARTITA_MAG_PICKING_V", Boolean.class));
             dbSettingsModelIstance.setFlagMultiClienteOrdV(getValueFromList(list, "SETUP", "FLAG_MULTI_CLIENTE_ORD_VENDITA", Boolean.class));
             dbSettingsModelIstance.setFlagUseCodAnagAziendale(getValueFromList(list, "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE", Boolean.class));
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java
index 5b7f01b3..d5130ea0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java
@@ -1,9 +1,17 @@
 package it.integry.integrywmsnative.core.utility;
 
+import androidx.annotation.Nullable;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.concurrent.TimeUnit;
 
 import it.integry.integrywmsnative.core.exception.DateNotRecognizedException;
 import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException;
@@ -14,6 +22,8 @@ import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException;
 
 public class UtilityDate {
 
+    private static final ZoneId currentZone = ZoneId.systemDefault();
+
     public static class COMMONS_DATE_FORMATS {
         public static final String DMY_SLASH = "dd/MM/yyyy";
         public static final String YMD_SLASH = "yyyy/MM/dd";
@@ -119,4 +129,97 @@ public class UtilityDate {
     public static Calendar getCalendarInstance() {
         return Calendar.getInstance();
     }
+
+
+
+
+    public static String formatDate(LocalDate dateToFormat, String format) {
+        if (dateToFormat != null) {
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
+            return dateToFormat.format(formatter);
+        } else return null;
+    }
+
+
+    public static String formatDate(LocalDateTime dateToFormat, String format) {
+        if (dateToFormat != null) {
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
+            return dateToFormat.format(formatter);
+        } else return null;
+    }
+
+    public static boolean isBeforeToday(LocalDateTime inputDate) {
+        return inputDate != null && inputDate.toLocalDate().isBefore(getNow());
+    }
+
+    public static boolean isAfterToday(LocalDateTime inputDate) {
+        return inputDate != null && inputDate.toLocalDate().isAfter(getNow());
+    }
+
+    public static boolean isToday(LocalDateTime inputDate) {
+        return inputDate != null && inputDate.toLocalDate().isEqual(getNow());
+    }
+
+    public static LocalDate toLocalDate(Date dateToConvert) {
+        return dateToConvert.toInstant()
+                .atZone(currentZone)
+                .toLocalDate();
+    }
+
+    public static LocalDateTime toLocalDateTime(Date dateToConvert) {
+        return dateToConvert.toInstant()
+                .atZone(currentZone)
+                .toLocalDateTime();
+    }
+
+    public static Date toDate(LocalDate dateToConvert) {
+        return Date.from(dateToConvert.atStartOfDay()
+                .atZone(currentZone)
+                .toInstant());
+    }
+
+    public static Date toDateTime(LocalDateTime dateToConvert) {
+        return Date.from(dateToConvert
+                .atZone(currentZone)
+                .toInstant());
+    }
+
+
+
+    public static LocalDate getNow() {
+        return Instant.now()
+                .atZone(currentZone)
+                .toLocalDate();
+    }
+
+    public static LocalDateTime getNowTime() {
+        return Instant.now()
+                .atZone(currentZone)
+                .toLocalDateTime();
+    }
+    public static LocalDate timeToLocalDate(long time, @Nullable String timezone) {
+        return Instant.ofEpochSecond(time)
+                .atZone(timezone == null ? currentZone : ZoneId.of(timezone))
+                .toLocalDate();
+    }
+
+    public static LocalDateTime timeToLocalDateTime(long time, @Nullable String timezone) {
+        return Instant.ofEpochSecond(time)
+                .atZone(timezone == null ? currentZone : ZoneId.of(timezone))
+                .toLocalDateTime();
+    }
+
+
+
+    public static long localDateTimeToTime(LocalDateTime localDateTime, @Nullable String timezone) {
+        return localDateTime
+                .atZone(timezone == null ? currentZone : ZoneId.of(timezone))
+                .toEpochSecond();
+    }
+
+    public static long localDateToTime(LocalDate localDate) {
+        return TimeUnit.DAYS.toSeconds(localDate.toEpochDay());
+    }
+
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDimension.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDimension.java
index 71d12bae..8a9cb2c2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDimension.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDimension.java
@@ -17,10 +17,26 @@ public class UtilityDimension {
         );
     }
 
-    public static float convertDpToPixel(float dp){
-        DisplayMetrics metrics = Resources.getSystem().getDisplayMetrics();
-        float px = dp * (metrics.densityDpi / 160f);
-        return Math.round(px);
+    /**
+     * This method converts dp unit to equivalent pixels, depending on device density.
+     *
+     * @param dp A value in dp (density independent pixels) unit. Which we need to convert into pixels
+     * @param context Context to get resources and device specific display metrics
+     * @return A float value to represent px equivalent to dp depending on device density
+     */
+    public static float convertDpToPixel(float dp, Context context){
+        return dp * ((float) context.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);
+    }
+
+    /**
+     * This method converts device specific pixels to density independent pixels.
+     *
+     * @param px A value in px (pixels) unit. Which we need to convert into db
+     * @param context Context to get resources and device specific display metrics
+     * @return A float value to represent dp equivalent to px value
+     */
+    public static float convertPixelsToDp(float px, Context context){
+        return px / ((float) context.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
index 33ddd09d..3641df5d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
@@ -72,7 +72,7 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
 import it.integry.integrywmsnative.view.dialogs.ask_should_versamento_automatico_ul.DialogAskShouldVersamentoAutomaticoULView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
-import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialog;
+import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLU;
 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.versamento_automatico_ul_done.DialogVersamentoAutomaticoULDoneView;
@@ -129,7 +129,6 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
         setSupportActionBar(mBindings.toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mBindings.bottomSheetLuContent.init(mBindings.bottomSheetLuContent, null);
         mBottomSheetFragmentLUContentViewModel = mBindings.bottomSheetLuContent.getViewModelInstance();
         mBindings.bottomSheetLuContent.setListener(this);
         mBottomSheetFragmentLUContentViewModel.setListener(this);
@@ -787,7 +786,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     @Override
     public void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
         runOnUiThread(() -> {
-            InfoAggiuntiveLUDialog.newInstance(onComplete).show(getSupportFragmentManager(), "InfoAggiuntiveLUDialog");
+            DialogInfoAggiuntiveLU.newInstance(onComplete).show(getSupportFragmentManager(), "InfoAggiuntiveLUDialog");
         });
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java
index aaff1b99..190e36b0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java
@@ -32,7 +32,7 @@ import it.integry.integrywmsnative.databinding.FragmentDocInterniBinding;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoView;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoViewModel;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaArticoliDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormActivity;
 import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListAdapter;
 import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListModel;
@@ -200,7 +200,7 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment,
     }
 
     @Override
-    public void onDocumentEditRequest(SqlMtbColt document, GrigliaAcquistiDTO arts) {
+    public void onDocumentEditRequest(SqlMtbColt document, GrigliaArticoliDTO arts) {
         requireActivity().startActivity(DocInterniEditFormActivity.newInstance(requireActivity(), document, arts, mViewModel.getTipoDoc()));
     }
 }
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 11c63f54..7b10cba1 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
@@ -17,7 +17,7 @@ import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoViewModel;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaArticoliDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GruppiArticoloDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
@@ -31,7 +31,7 @@ public class DocInterniViewModel {
     private boolean productsFetched = true;
     private boolean docsFetched = true;
     private int nextNumCollo = 0;
-    private GrigliaAcquistiDTO productsList;
+    private GrigliaArticoliDTO productsList;
     private final MutableLiveData<List<DocInternoWrapper>> mDocsList = new MutableLiveData<>();
 
     public final MutableLiveData<TipiDocDTO> dtbTipi = new MutableLiveData<>();
@@ -198,7 +198,7 @@ public class DocInterniViewModel {
 
         void onDocDetailsChanged(DialogSelectDocInfoViewModel selection);
 
-        void onDocumentEditRequest(SqlMtbColt document, GrigliaAcquistiDTO arts);
+        void onDocumentEditRequest(SqlMtbColt document, GrigliaArticoliDTO arts);
 
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiChildDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiChildDTO.java
index a88b0100..8273167a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiChildDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiChildDTO.java
@@ -4,17 +4,17 @@ import java.math.BigDecimal;
 
 public class GrigliaAcquistiChildDTO {
 
-    public String codMart;
-    public String descrizione;
-    public String untMis;
-    public BigDecimal qtaCnf;
-    public String barcode;
-    public BigDecimal merceDaRic;
-    public BigDecimal mediaSett;
-    public String flagQtaMultipla;
-    public String flagTracciabilita;
-    public BigDecimal qtaMinOrdinabile;
-    public boolean newNoPromo;
+    private String codMart;
+    private String descrizione;
+    private String untMis;
+    private BigDecimal qtaCnf;
+    private String barcode;
+    private BigDecimal merceDaRic;
+    private BigDecimal mediaSett;
+    private String flagQtaMultipla;
+    private String flagTracciabilita;
+    private BigDecimal qtaMinOrdinabile;
+    private boolean newNoPromo;
     private int ggScadenza;
     private float giacenza;
     private float qtaPrevistaVendita;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaArticoliDTO.java
similarity index 95%
rename from app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiDTO.java
rename to app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaArticoliDTO.java
index dc5da0a3..a09f00ae 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaArticoliDTO.java
@@ -2,7 +2,7 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto;
 
 import java.util.List;
 
-public class GrigliaAcquistiDTO {
+public class GrigliaArticoliDTO {
 
     private String descrLisa;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
index fdc71f7b..fd1c5880 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
@@ -38,7 +38,7 @@ import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.ActivityContabDocInterniEditBinding;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiChildDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaArticoliDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsView;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.ui.DocumentRowsListAdapter;
@@ -77,7 +77,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
     public BindableBoolean isDocumentExportable = new BindableBoolean(false);
     private final ObservableArrayList<SqlMtbColr> documentRowsObservableList = new ObservableArrayList<>();
 
-    public static Intent newInstance(Context context, SqlMtbColt document, GrigliaAcquistiDTO productList, TipiDocDTO tipoDoc) {
+    public static Intent newInstance(Context context, SqlMtbColt document, GrigliaArticoliDTO productList, TipiDocDTO tipoDoc) {
         Intent myIntent = new Intent(context, DocInterniEditFormActivity.class);
 
         String doc = DataCache.addItem(document);
@@ -98,7 +98,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
                 .create()
                 .inject(this);
         SqlMtbColt document = DataCache.retrieveItem(getIntent().getStringExtra(DATA_KEY_DOCUMENT));
-        GrigliaAcquistiDTO griglia = DataCache.retrieveItem(getIntent().getStringExtra(DATA_KEY_PRODUCTS_LIST));
+        GrigliaArticoliDTO griglia = DataCache.retrieveItem(getIntent().getStringExtra(DATA_KEY_PRODUCTS_LIST));
         List<GrigliaAcquistiChildDTO> productList = griglia.getGrigliaAcquistiChild();
         TipiDocDTO docType = DataCache.retrieveItem(getIntent().getStringExtra(DATA_KEY_TIPO_DOC));
 
@@ -145,7 +145,6 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         FabMenuCustomAnimations.changeIconOnFocus(binding.closeActivityFab, R.drawable.ic_menu_24dp, R.drawable.ic_close_24dp);
         binding.bottomSheetMtbColrEdit.setListener(this);
-        binding.bottomSheetMtbColrEdit.init(binding.bottomSheetMtbColrEdit, binding.bottomSheetMtbColrEditBackground);
     }
 
     private void initViewModel() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
index e88674a2..ca0576a9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
@@ -298,7 +298,7 @@ public class DocInterniEditFormViewModel {
     }
 
     public GrigliaAcquistiChildDTO getArticoloByCodMart(String codMart) {
-        return Stream.of(productsList).filter(prod -> prod.codMart.equalsIgnoreCase(codMart)).findFirstOrElse(null);
+        return Stream.of(productsList).filter(prod -> prod.getCodMart().equalsIgnoreCase(codMart)).findFirstOrElse(null);
     }
 
     public DocInterniEditFormViewModel setTipoDoc(TipiDocDTO docType) {
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 ddee9417..5e481d43 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
@@ -9,7 +9,7 @@ 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.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaArticoliDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import retrofit2.Call;
@@ -40,16 +40,16 @@ public class DocInterniRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void fetchProducts(String codDtip, String codMgrp, RunnableArgs<GrigliaAcquistiDTO> onComplete, RunnableArgs<Exception> onFailed) {
+    public void fetchProducts(String codDtip, String codMgrp, RunnableArgs<GrigliaArticoliDTO> onComplete, RunnableArgs<Exception> onFailed) {
         DocInterniRESTConsumerService service = RESTBuilder.getService(DocInterniRESTConsumerService.class);
-        service.fetchProducts(codDtip,codMgrp,"L").enqueue(new Callback<>() {
+        service.retrieveProducts(codDtip,codMgrp,"L").enqueue(new Callback<>() {
             @Override
-            public void onResponse(Call<ServiceRESTResponse<GrigliaAcquistiDTO>> call, Response<ServiceRESTResponse<GrigliaAcquistiDTO>> response) {
+            public void onResponse(Call<ServiceRESTResponse<GrigliaArticoliDTO>> call, Response<ServiceRESTResponse<GrigliaArticoliDTO>> response) {
                 analyzeAnswer(response, "fetchProducts", onComplete, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<GrigliaAcquistiDTO>> call, Throwable t) {
+            public void onFailure(Call<ServiceRESTResponse<GrigliaArticoliDTO>> call, Throwable t) {
                 onFailed.run(new Exception(t));
             }
         });
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 6988eed8..6f307241 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
@@ -2,7 +2,7 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.rest;
 
 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.GrigliaAcquistiDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaArticoliDTO;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;
@@ -13,6 +13,11 @@ public interface DocInterniRESTConsumerService {
     @GET("getDocInterniSetup")
     Call<ServiceRESTResponse<DocInterniSetupDTO>> getSetupDocInterni();
 
+
     @GET("getElencoArticoli")
-    Call<ServiceRESTResponse<GrigliaAcquistiDTO>> fetchProducts(@Query("codDtip") String codDtip, @Query("codMgrp") String codMgrp, @Query("gestione") String gestione);
+    Call<ServiceRESTResponse<GrigliaArticoliDTO>> retrieveProducts(
+            @Query("codDtip") String codDtip,
+            @Query("codMgrp") String codMgrp,
+            @Query("gestione") String gestione);
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariComponent.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariComponent.java
new file mode 100644
index 00000000..deed598a
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariComponent.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.inventario;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface ElencoInventariComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+
+        ElencoInventariComponent create();
+    }
+
+    void inject(ElencoInventariFragment inventarioFragment);
+}
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
new file mode 100644
index 00000000..eb959f68
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariFragment.java
@@ -0,0 +1,158 @@
+package it.integry.integrywmsnative.gest.inventario;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.ravikoradiya.liveadapter.LiveAdapter;
+import com.ravikoradiya.liveadapter.Type;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.BR;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.expansion.BaseFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgss;
+import it.integry.integrywmsnative.core.interfaces.ILifecycleFragment;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.rest.model.inventario.InventarioArtDTO;
+import it.integry.integrywmsnative.databinding.FragmentElencoInventarioBinding;
+import it.integry.integrywmsnative.databinding.FragmentElencoInventarioListSingleItemBinding;
+import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_actions.BottomSheetInventarioActionsView;
+import it.integry.integrywmsnative.gest.inventario.dialogs.ask_info_inventario.DialogAskInfoInventarioView;
+import it.integry.integrywmsnative.gest.inventario.picking.PickingInventarioActivity;
+import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
+
+public class ElencoInventariFragment extends BaseFragment implements ITitledFragment, ILifecycleFragment, ElencoInventariViewModel.Listener {
+
+    private FragmentElencoInventarioBinding mBinding;
+
+    @Inject
+    ElencoInventariViewModel mViewModel;
+
+    private int barcodeScannerIstanceID = -1;
+
+    public ElencoInventariFragment() {
+        // Required empty public constructor
+    }
+
+
+    public static ElencoInventariFragment newInstance() {
+        return new ElencoInventariFragment();
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+
+        MainApplication.appComponent
+                .inventarioComponent()
+                .create()
+                .inject(this);
+
+        mViewModel.setListener(this);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        mBinding = FragmentElencoInventarioBinding.inflate(inflater, container, false);
+
+        mBinding.setLifecycleOwner(this);
+        mBinding.setViewmodel(mViewModel);
+
+        mViewModel.loadData();
+        this.initRecyclerView();
+
+        return mBinding.getRoot();
+    }
+
+    private void initRecyclerView() {
+        mViewModel.getInventarioList().observe(getViewLifecycleOwner(), data -> {
+//            binding.reportEmptyView.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);
+        itemType.onClick(x -> {
+
+            new BottomSheetInventarioActionsView(x.getBinding().getItem())
+                    .setListener(new BottomSheetInventarioActionsView.Listener() {
+                        @Override
+                        public void onItemEdit() {
+                            mViewModel.loadInventarioData(x.getBinding().getItem().getIdInventario(), listArts -> {
+                                startPicking(x.getBinding().getItem(), listArts);
+                            });
+                        }
+
+                        @Override
+                        public void onItemDelete() {
+
+                        }
+                    })
+                    .show(requireActivity().getSupportFragmentManager(), "tag");
+
+            return null;
+        });
+
+        new LiveAdapter(mViewModel.getInventarioList(), this)
+                .map(InventarioRoomDTO.class, itemType)
+                .into(this.mBinding.inventarioList);
+
+
+//        binding.swiperefresh.setRefreshing(true);
+//        binding.swiperefresh.setOnRefreshListener(() -> {
+//            viewModel.loadData();
+//        });
+    }
+
+
+    private void startPicking(InventarioRoomDTO inventarioRoomDTO, List<InventarioArtDTO> listArts) {
+        PickingInventarioActivity.startActivity(requireContext(), inventarioRoomDTO, listArts);
+    }
+
+
+    @Override
+    public void onPreDestroy(Runnable onComplete) {
+        mViewModel.destroyData();
+        onComplete.run();
+    }
+
+    @Override
+    public void onCreateActionBar(AppCompatTextView titleText, Context context) {
+        titleText.setText(context.getText(R.string.inventario_fragment_title).toString());
+    }
+
+    @Override
+    public void onInventarioInfoRequest(RunnableArgss<Integer, String> onComplete) {
+        DialogAskInfoInventarioView.newInstance(onComplete, null)
+                .show(requireActivity().getSupportFragmentManager(), "tag");
+    }
+
+    @Override
+    public void onCreateInventarioRequest(int inventoryId, String zone) {
+        DialogYesNoView
+                .newInstance(null, "Vuoi procedere con la creazione di un nuovo inventario con codice " + inventoryId + "?",
+                        dialogResponse -> {
+                            switch (dialogResponse) {
+                                case YES:
+                                    this.mViewModel.createNewInventario(inventoryId, zone, this::startPicking);
+                                    break;
+
+                                case NO:
+                                case ABORT:
+                                    mViewModel.openInventario();
+                                    break;
+                            }
+                        })
+                .show(requireActivity().getSupportFragmentManager(), "tag");
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..04752e0c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariModule.java
@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.gest.inventario;
+
+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.settings.SettingsManager;
+import it.integry.integrywmsnative.core.rest.consumers.InventarioRESTConsumer;
+
+@Module(subcomponents = ElencoInventariComponent.class)
+public class ElencoInventariModule {
+
+    @Provides
+    @Singleton
+    InventarioRESTConsumer providesInventarioRESTConsumer() {
+        return new InventarioRESTConsumer();
+    }
+
+    @Provides
+    @Singleton
+    ElencoInventariViewModel providesInventarioViewModel(
+            InventarioRepository inventarioRepository,
+            InventarioRESTConsumer inventarioRESTConsumer,
+            SettingsManager settingsManager) {
+        return new ElencoInventariViewModel(inventarioRepository, inventarioRESTConsumer, settingsManager);
+    }
+
+}
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
new file mode 100644
index 00000000..3cf5b663
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariViewModel.java
@@ -0,0 +1,133 @@
+package it.integry.integrywmsnative.gest.inventario;
+
+import androidx.lifecycle.LiveData;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+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;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.rest.consumers.InventarioRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.inventario.InventarioArtDTO;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class ElencoInventariViewModel {
+
+    private final InventarioRepository inventarioRepository;
+    private final InventarioRESTConsumer inventarioRESTConsumer;
+    private final SettingsManager settingsManager;
+    private Listener listener;
+
+    private LiveData<List<InventarioRoomDTO>> inventarioList;
+
+    private final String codMdep;
+
+    public ElencoInventariViewModel(
+            InventarioRepository inventarioRepository,
+            InventarioRESTConsumer inventarioRESTConsumer,
+            SettingsManager settingsManager) {
+        this.inventarioRepository = inventarioRepository;
+        this.inventarioRESTConsumer = inventarioRESTConsumer;
+        this.settingsManager = settingsManager;
+
+
+        codMdep = settingsManager.getSettings().getUserSession().getDepo().getCodMdep();
+    }
+
+    public void loadData() {
+        inventarioList = inventarioRepository.retrieve();
+    }
+
+    public void destroyData() {
+        inventarioList = null;
+    }
+
+    public LiveData<List<InventarioRoomDTO>> getInventarioList() {
+        return inventarioList;
+    }
+
+    public void openInventario() {
+        sendOnInventarioInfoRequest((inventoryId, zone) -> {
+            this.sendOnLoadingStarted();
+
+            inventarioRESTConsumer.loadInventario(inventoryId, loadedInventario -> {
+                this.sendOnLoadingEnded();
+
+                if (loadedInventario == null || loadedInventario.getMtbInvent() == null)
+                    this.sendCreateInventarioRequest(inventoryId, zone);
+                else this.createNewInventario(inventoryId, zone, (inventarioRoom, listaArts) -> {
+
+                });
+            }, this::sendOnError);
+        });
+    }
+
+
+    public void loadInventarioData(long inventoryId, RunnableArgs<List<InventarioArtDTO>> onComplete) {
+        this.sendOnLoadingStarted();
+        inventarioRESTConsumer.loadInventarioArts(inventoryId, inventarioArts -> {
+            this.sendOnLoadingEnded();
+
+            onComplete.run(inventarioArts.getArts());
+        }, this::sendOnError);
+    }
+
+
+    public void createNewInventario(long inventoryId, String zone, RunnableArgss<InventarioRoomDTO, List<InventarioArtDTO>> onComplete) {
+        this.sendOnLoadingStarted();
+
+        var codMdep = settingsManager.getSettings().getUserSession().getDepo().getCodMdep();
+
+        var createdInventario = new InventarioRoomDTO();
+        createdInventario.setIdInventario(inventoryId);
+        createdInventario.setCodMdep(codMdep);
+        createdInventario.setInseritoDa(settingsManager.getSettings().getUser().getFullname());
+        createdInventario.setDataInventario(UtilityDate.getNow());
+
+        inventarioRepository.insert(createdInventario, () -> {
+            loadInventarioData(inventoryId, inventarioArts -> {
+                this.sendOnLoadingEnded();
+                onComplete.run(createdInventario, inventarioArts);
+            });
+        }, this::sendOnError);
+    }
+
+
+    public void setListener(Listener listener) {
+        this.listener = listener;
+    }
+
+    private void sendOnInventarioInfoRequest(RunnableArgss<Integer, String> onComplete) {
+        if (listener != null) listener.onInventarioInfoRequest(onComplete);
+    }
+
+    private void sendCreateInventarioRequest(int inventoryId, String zone) {
+        if (this.listener != null) this.listener.onCreateInventarioRequest(inventoryId, zone);
+    }
+
+    private void sendOnLoadingStarted() {
+        if (this.listener != null) listener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.listener != null) listener.onLoadingEnded();
+    }
+
+    private void sendOnError(Exception ex) {
+        if (this.listener != null) listener.onError(ex);
+    }
+
+    public interface Listener extends ILoadingListener {
+
+        void onInventarioInfoRequest(RunnableArgss<Integer, String> onComplete);
+
+        void onCreateInventarioRequest(int inventoryId, String zone);
+
+        void onError(Exception ex);
+
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsComponent.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsComponent.java
new file mode 100644
index 00000000..896332e1
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsComponent.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_actions;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface BottomSheetInventarioActionsComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        BottomSheetInventarioActionsComponent create();
+    }
+
+    void inject(BottomSheetInventarioActionsView bottomSheetItemEditView);
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsModule.java
new file mode 100644
index 00000000..87ed55bb
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_actions;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = BottomSheetInventarioActionsComponent.class)
+public class BottomSheetInventarioActionsModule {
+
+    @Provides
+    BottomSheetInventarioActionsViewModel providesBottomSheetItemEditViewModel() {
+        return new BottomSheetInventarioActionsViewModel();
+    }
+
+}
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
new file mode 100644
index 00000000..96283ccc
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsView.java
@@ -0,0 +1,111 @@
+package it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_actions;
+
+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.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.databinding.BottomSheetInventarioActionsViewBinding;
+
+public class BottomSheetInventarioActionsView extends BottomSheetDialogFragment {
+
+    @Inject
+    BottomSheetInventarioActionsViewModel mViewModel;
+
+    public ObservableField<Boolean> enabledEditButton = new ObservableField<>(true);
+    public ObservableField<Boolean> enabledDeleteButton = new ObservableField<>(true);
+
+    private BottomSheetInventarioActionsViewBinding mBinding;
+    private Listener mListener;
+
+    private final InventarioRoomDTO inputItem;
+
+    public BottomSheetInventarioActionsView(InventarioRoomDTO inputItem) {
+        this.inputItem = inputItem;
+    }
+
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        MainApplication.appComponent
+                .bottomSheetInventarioActionsComponent()
+                .create()
+                .inject(this);
+
+        mViewModel.init(inputItem);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBinding = BottomSheetInventarioActionsViewBinding.inflate(inflater, container, true);
+
+        mBinding.setLifecycleOwner(this);
+        mBinding.setViewModel(mViewModel);
+        mBinding.setView(this);
+
+        mBinding.executePendingBindings();
+
+        return mBinding.getRoot();
+    }
+
+
+
+
+    public BottomSheetInventarioActionsView enableEditButton() {
+        this.enabledEditButton.set(true);
+        return this;
+    }
+
+    public BottomSheetInventarioActionsView disableEditButton() {
+        this.enabledEditButton.set(false);
+        return this;
+    }
+
+    public BottomSheetInventarioActionsView enableDeleteButton() {
+        this.enabledDeleteButton.set(true);
+        return this;
+    }
+
+    public BottomSheetInventarioActionsView disableDeleteButton() {
+        this.enabledDeleteButton.set(false);
+        return this;
+    }
+
+
+
+    public void editItem() {
+        if(this.mListener != null) this.mListener.onItemEdit();
+        this.dismiss();
+    }
+
+    public void deleteItem() {
+        if(this.mListener != null) this.mListener.onItemDelete();
+        this.dismiss();
+    }
+
+
+
+    public BottomSheetInventarioActionsView setListener(Listener listener) {
+        this.mListener = listener;
+        return this;
+    }
+
+    public interface Listener {
+        void onItemEdit();
+
+        void onItemDelete();
+    }
+}
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
new file mode 100644
index 00000000..c1d14ab1
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_actions/BottomSheetInventarioActionsViewModel.java
@@ -0,0 +1,18 @@
+package it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_actions;
+
+import androidx.lifecycle.MutableLiveData;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+
+public class BottomSheetInventarioActionsViewModel {
+
+    private final MutableLiveData<InventarioRoomDTO> mCurrentItem = new MutableLiveData<>();
+
+    public void init(InventarioRoomDTO item) {
+        this.mCurrentItem.postValue(item);
+    }
+
+    public MutableLiveData<InventarioRoomDTO> getCurrentItem() {
+        return mCurrentItem;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_row_actions/BottomSheetInventarioRowActionsComponent.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_row_actions/BottomSheetInventarioRowActionsComponent.java
new file mode 100644
index 00000000..f4e33f9c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_row_actions/BottomSheetInventarioRowActionsComponent.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_actions;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface BottomSheetInventarioRowActionsComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        BottomSheetInventarioRowActionsComponent create();
+    }
+
+    void inject(BottomSheetInventarioRowActionsView bottomSheetItemEditView);
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_row_actions/BottomSheetInventarioRowActionsModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_row_actions/BottomSheetInventarioRowActionsModule.java
new file mode 100644
index 00000000..dc1e37e6
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_row_actions/BottomSheetInventarioRowActionsModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_actions;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = BottomSheetInventarioRowActionsComponent.class)
+public class BottomSheetInventarioRowActionsModule {
+
+    @Provides
+    BottomSheetInventarioRowActionsViewModel providesBottomSheetItemEditViewModel() {
+        return new BottomSheetInventarioRowActionsViewModel();
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_row_actions/BottomSheetInventarioRowActionsView.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_row_actions/BottomSheetInventarioRowActionsView.java
new file mode 100644
index 00000000..f6b02cb7
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_row_actions/BottomSheetInventarioRowActionsView.java
@@ -0,0 +1,111 @@
+package it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_actions;
+
+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.core.data_store.db.entity.InventarioRowRoomDTO;
+import it.integry.integrywmsnative.databinding.BottomSheetInventarioRowActionsViewBinding;
+
+public class BottomSheetInventarioRowActionsView extends BottomSheetDialogFragment {
+
+    @Inject
+    BottomSheetInventarioRowActionsViewModel mViewModel;
+
+    public ObservableField<Boolean> enabledEditButton = new ObservableField<>(true);
+    public ObservableField<Boolean> enabledDeleteButton = new ObservableField<>(true);
+
+    private BottomSheetInventarioRowActionsViewBinding mBinding;
+    private Listener mListener;
+
+    private final InventarioRowRoomDTO inputItem;
+
+    public BottomSheetInventarioRowActionsView(InventarioRowRoomDTO inputItem) {
+        this.inputItem = inputItem;
+    }
+
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        MainApplication.appComponent
+                .bottomSheetInventarioRowActionsComponent()
+                .create()
+                .inject(this);
+
+        mViewModel.init(inputItem);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBinding = BottomSheetInventarioRowActionsViewBinding.inflate(inflater, container, true);
+
+        mBinding.setLifecycleOwner(this);
+        mBinding.setViewModel(mViewModel);
+        mBinding.setView(this);
+
+        mBinding.executePendingBindings();
+
+        return mBinding.getRoot();
+    }
+
+
+
+
+    public BottomSheetInventarioRowActionsView enableEditButton() {
+        this.enabledEditButton.set(true);
+        return this;
+    }
+
+    public BottomSheetInventarioRowActionsView disableEditButton() {
+        this.enabledEditButton.set(false);
+        return this;
+    }
+
+    public BottomSheetInventarioRowActionsView enableDeleteButton() {
+        this.enabledDeleteButton.set(true);
+        return this;
+    }
+
+    public BottomSheetInventarioRowActionsView disableDeleteButton() {
+        this.enabledDeleteButton.set(false);
+        return this;
+    }
+
+
+
+    public void editItem() {
+        if(this.mListener != null) this.mListener.onItemEdit();
+        this.dismiss();
+    }
+
+    public void deleteItem() {
+        if(this.mListener != null) this.mListener.onItemDelete();
+        this.dismiss();
+    }
+
+
+
+    public BottomSheetInventarioRowActionsView setListener(Listener listener) {
+        this.mListener = listener;
+        return this;
+    }
+
+    public interface Listener {
+        void onItemEdit();
+
+        void onItemDelete();
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_row_actions/BottomSheetInventarioRowActionsViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_row_actions/BottomSheetInventarioRowActionsViewModel.java
new file mode 100644
index 00000000..a078a3f0
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/bottom_sheet__inventario_row_actions/BottomSheetInventarioRowActionsViewModel.java
@@ -0,0 +1,18 @@
+package it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_actions;
+
+import androidx.lifecycle.MutableLiveData;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
+
+public class BottomSheetInventarioRowActionsViewModel {
+
+    private final MutableLiveData<InventarioRowRoomDTO> mCurrentItem = new MutableLiveData<>();
+
+    public void init(InventarioRowRoomDTO item) {
+        this.mCurrentItem.postValue(item);
+    }
+
+    public MutableLiveData<InventarioRowRoomDTO> getCurrentItem() {
+        return mCurrentItem;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioComponent.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioComponent.java
new file mode 100644
index 00000000..61c6dc6b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.inventario.dialogs.ask_info_inventario;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogAskInfoInventarioComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogAskInfoInventarioComponent create();
+    }
+
+    void inject(DialogAskInfoInventarioView dialogAskInfoInventarioView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioModule.java
new file mode 100644
index 00000000..9f8b6a07
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.inventario.dialogs.ask_info_inventario;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogAskInfoInventarioComponent.class)
+public class DialogAskInfoInventarioModule {
+
+    @Provides
+    DialogAskInfoInventarioViewModel providesDialogAskInfoInventarioViewModel() {
+        return new DialogAskInfoInventarioViewModel();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioView.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioView.java
new file mode 100644
index 00000000..b576b13e
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioView.java
@@ -0,0 +1,80 @@
+package it.integry.integrywmsnative.gest.inventario.dialogs.ask_info_inventario;
+
+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 androidx.databinding.ObservableField;
+
+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.RunnableArgss;
+import it.integry.integrywmsnative.databinding.DialogAskInfoInventarioBinding;
+
+public class DialogAskInfoInventarioView extends BaseDialogFragment {
+
+    @Inject
+    DialogAskInfoInventarioViewModel mViewModel;
+
+    private final RunnableArgss<Integer, String> onConfirmed;
+    private final Runnable onAbort;
+
+    public ObservableField<Integer> inventoryId = new ObservableField<>();
+    public ObservableField<String> zone = new ObservableField<>();
+
+    private DialogAskInfoInventarioBinding mBindings;
+    private Context mContext;
+
+    //Pass here all external parameters
+    public static DialogAskInfoInventarioView newInstance(RunnableArgss<Integer, String> onConfirmed, Runnable onAbort) {
+        return new DialogAskInfoInventarioView(onConfirmed, onAbort);
+    }
+
+    private DialogAskInfoInventarioView(RunnableArgss<Integer, String> onConfirmed, Runnable onAbort) {
+        super();
+
+        this.onConfirmed = onConfirmed;
+        this.onAbort = onAbort;
+    }
+
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogAskInfoInventarioBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+        mBindings.setView(this);
+
+        MainApplication.appComponent
+                .dialogAskInfoInventarioComponent()
+                .create()
+                .inject(this);
+
+        var cancelable = true;
+
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(cancelable)
+                .setPositiveButton(R.string.ok, (dialog, which) -> {
+                    if (this.onConfirmed != null)
+                        this.onConfirmed.run(this.inventoryId.get(), this.zone.get());
+                })
+                .setNegativeButton(R.string.abort, (dialog, which) -> {
+                    if (this.onAbort != null) this.onAbort.run();
+                })
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(cancelable);
+        return alertDialog;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioViewModel.java
new file mode 100644
index 00000000..7c079924
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioViewModel.java
@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.gest.inventario.dialogs.ask_info_inventario;
+
+public class DialogAskInfoInventarioViewModel {
+
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..31b8698c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java
@@ -0,0 +1,218 @@
+package it.integry.integrywmsnative.gest.inventario.picking;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+
+import com.ravikoradiya.liveadapter.LiveAdapter;
+import com.ravikoradiya.liveadapter.Type;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+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_cache.DataCache;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
+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.model.MtbAart;
+import it.integry.integrywmsnative.core.rest.model.inventario.InventarioArtDTO;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.databinding.ActivityPickingInventarioBinding;
+import it.integry.integrywmsnative.databinding.ActivityPickingInventarioListItemBinding;
+import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_actions.BottomSheetInventarioRowActionsView;
+import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
+import it.integry.integrywmsnative.view.dialogs.DialogConsts;
+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 PickingInventarioActivity extends BaseActivity implements PickingInventarioViewModel.Listener {
+
+    @Inject
+    PickingInventarioViewModel mViewModel;
+
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
+    private ActivityPickingInventarioBinding mBindings;
+
+    private static final String KEY_INVENTARIO = "key_inventario";
+    private static final String KEY_INVENTARIO_ARTS = "key_inventario_arts";
+    private int barcodeScannerIstanceID;
+
+    //Pass here all external parameters
+    public static void startActivity(Context context, InventarioRoomDTO inventarioRoomDTO, List<InventarioArtDTO> inventarioArts) {
+        Intent myIntent = new Intent(context, PickingInventarioActivity.class);
+
+        String keyExtraItem = DataCache.addItem(inventarioRoomDTO);
+        myIntent.putExtra(KEY_INVENTARIO, keyExtraItem);
+
+        String keyExtraArtsItem = DataCache.addItem(inventarioArts);
+        myIntent.putExtra(KEY_INVENTARIO_ARTS, keyExtraArtsItem);
+
+        context.startActivity(myIntent);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.picking_inventario_menu, menu);
+        return true;
+    }
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mBindings = DataBindingUtil.setContentView(this, R.layout.activity_picking_inventario);
+        mBindings.setLifecycleOwner(this);
+        mBindings.setView(this);
+
+        MainApplication.appComponent
+                .pickingInventarioComponent()
+                .create()
+                .inject(this);
+
+        mViewModel.setListener(this);
+
+        mViewModel.init(
+                DataCache.retrieveItem(getIntent().getStringExtra(KEY_INVENTARIO)),
+                DataCache.retrieveItem(getIntent().getStringExtra(KEY_INVENTARIO_ARTS)));
+        mBindings.setViewmodel(mViewModel);
+
+        initToolbar();
+        initRecyclerView();
+        initBarcodeReader();
+    }
+
+
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
+    }
+
+    private void initToolbar() {
+        setSupportActionBar(mBindings.toolbar);
+
+        mBindings.toolbar.setOnMenuItemClickListener(menuItem -> {
+            if (menuItem.getItemId() == R.id.export) {
+                requestExportConfirm();
+                return true;
+            }
+
+            return false;
+        });
+    }
+
+    private void initRecyclerView() {
+        mViewModel.getCurrentInventarioRows().observe(this, data -> {
+//            binding.reportEmptyView.setVisibility(data == null || data.isEmpty() ? View.VISIBLE : View.GONE);
+        });
+
+        var itemType = new Type<InventarioRowRoomDTO, ActivityPickingInventarioListItemBinding>(R.layout.activity_picking_inventario__list_item, BR.item);
+        itemType.onClick(x -> {
+            new BottomSheetInventarioRowActionsView(x.getBinding().getItem())
+                    .setListener(new BottomSheetInventarioRowActionsView.Listener() {
+                        @Override
+                        public void onItemEdit() {
+                            updateItem(x.getBinding().getItem());
+                        }
+
+                        @Override
+                        public void onItemDelete() {
+                            deleteItemRequest(x.getBinding().getItem());
+                        }
+                    })
+                    .show(getSupportFragmentManager(), "tag");
+
+            return null;
+        });
+
+        new LiveAdapter(mViewModel.getCurrentInventarioRows(), this)
+                .map(InventarioRowRoomDTO.class, itemType)
+                .into(this.mBindings.pickingInventarioMainList);
+    }
+
+    private void initBarcodeReader() {
+        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessful(onScanSuccessful)
+                .setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false)));
+    }
+
+    private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
+        this.mViewModel.processBarcodeDTO(data, () -> {
+        });
+    };
+
+
+    private void updateItem(InventarioRowRoomDTO itemToUpdate) {
+        mViewModel.updateRow(itemToUpdate);
+    }
+
+
+    private void deleteItemRequest(InventarioRowRoomDTO itemToDelete) {
+        DialogYesNoView.newInstance("Eliminazione", "Vuoi davvero eliminare l'articolo?", result -> {
+            if (result == DialogConsts.Results.YES) {
+                mViewModel.deleteRow(itemToDelete);
+            }
+        }).show(getSupportFragmentManager(), "tag");
+    }
+
+    public void requestExportConfirm() {
+        DialogYesNoView.newInstance("Esporta", "Vuoi confermare e chiudere l'inventario?", result -> {
+                    mViewModel.exportAll(this::onBackPressed);
+                })
+                .show(getSupportFragmentManager(), "tag");
+    }
+
+    @Override
+    public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, String partitaMag, Date dataScad, boolean canOverflowOrderQuantity, boolean canPartitaMagBeChanged, boolean canLUBeClosed, RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
+        DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
+                .setMtbAart(mtbAart)
+                .setInitialNumCnf(initialNumCnf)
+                .setInitialQtaCnf(initialQtaCnf)
+                .setInitialQtaTot(initialQtaTot)
+                .setTotalQtaAvailable(totalQtaAvailable)
+                .setTotalNumCnfAvailable(totalNumCnfAvailable)
+                .setQtaCnfAvailable(qtaCnfAvailable)
+                .setTotalQtaToBeTaken(totalQtaToBeTaken)
+                .setTotalNumCnfToBeTaken(totalNumCnfToBeTaken)
+                .setQtaCnfToBeTaken(qtaCnfToBeTaken)
+                .setPartitaMag(partitaMag)
+                .setDataScad(dataScad)
+                .setCanOverflowOrderQuantity(canOverflowOrderQuantity)
+                .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
+                .setCanLUBeClosed(canLUBeClosed);
+
+        if (!mDialogInputQuantityV2View.isVisible())
+            mDialogInputQuantityV2View.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                    .setOnComplete((resultDTO, shouldCloseLU) -> {
+                        PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
+                                .setNumCnf(resultDTO.getNumCnf())
+                                .setQtaCnf(resultDTO.getQtaCnf())
+                                .setQtaTot(resultDTO.getQtaTot())
+                                .setPartitaMag(resultDTO.getPartitaMag())
+                                .setDataScad(resultDTO.getDataScad());
+
+                        onComplete.run(pickedQuantityDTO, shouldCloseLU);
+                    })
+                    .show(getSupportFragmentManager(), "tag");
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioComponent.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioComponent.java
new file mode 100644
index 00000000..b76c36e3
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.inventario.picking;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface PickingInventarioComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        PickingInventarioComponent create();
+    }
+
+    void inject(PickingInventarioActivity PickingInventarioActivity);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioListAdapter.java
new file mode 100644
index 00000000..4475427c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioListAdapter.java
@@ -0,0 +1,85 @@
+package it.integry.integrywmsnative.gest.inventario.picking;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.databinding.ObservableArrayList;
+import androidx.recyclerview.widget.RecyclerView;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
+import it.integry.integrywmsnative.core.expansion.view.ExtendedRecyclerView;
+import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.databinding.ActivityPickingInventarioListItemBinding;
+
+public class PickingInventarioListAdapter extends ExtendedRecyclerView<InventarioRowRoomDTO, PickingInventarioListAdapter.ViewHolder> {
+
+    private PickingInventarioListAdapter.OnItemClickListener mOnItemClickListener;
+
+    public PickingInventarioListAdapter(ObservableArrayList<InventarioRowRoomDTO> myDataset) {
+        super(myDataset);
+    }
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        protected ActivityPickingInventarioListItemBinding mViewDataBinding;
+
+
+        public ViewHolder(ActivityPickingInventarioListItemBinding v) {
+            super(v.getRoot());
+            mViewDataBinding = v;
+        }
+
+        public void bind(InventarioRowRoomDTO inventarioRowRoomDTO) {
+            mViewDataBinding.setItem(inventarioRowRoomDTO);
+            mViewDataBinding.executePendingBindings();
+        }
+    }
+
+
+    @NonNull
+    @Override
+    public PickingInventarioListAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        // create a new view
+        ActivityPickingInventarioListItemBinding viewDataBinding =
+                ActivityPickingInventarioListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
+
+        return new ViewHolder(viewDataBinding);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull PickingInventarioListAdapter.ViewHolder holder, int position) {
+        InventarioRowRoomDTO mtbColr = mDataset.get(position);
+        holder.bind(mtbColr);
+//
+//        //Setting qty with unt_mis
+//        if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissaBoolean())){
+//            String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
+//
+//            if(mtbColr.getMtbAart() != null) {
+//                text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
+//            }
+//
+//            holder.mViewDataBinding.qtaTextview.setText(text);
+//        } else {
+//            holder.mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
+//        }
+//
+//        holder.mViewDataBinding.getRoot().setOnClickListener(x -> {
+//            if(mOnItemClickListener != null) {
+//                mOnItemClickListener.onItemClick(holder.mViewDataBinding.getMtbColr());
+//            }
+//        });
+//
+//        holder.mViewDataBinding.executePendingBindings();
+    }
+
+
+    public PickingInventarioListAdapter setOnItemClickListener(OnItemClickListener onItemClickListener) {
+        this.mOnItemClickListener = onItemClickListener;
+        return this;
+    }
+
+    public interface OnItemClickListener {
+        void onItemClick(MtbColr item);
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioModule.java
new file mode 100644
index 00000000..b7f6cafa
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioModule.java
@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.gest.inventario.picking;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.InventarioRepository;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.InventarioRowRepository;
+
+@Module(subcomponents = PickingInventarioComponent.class)
+public class PickingInventarioModule {
+
+    @Provides
+    PickingInventarioViewModel providesPickingInventarioViewModel(InventarioRepository inventarioRepository, InventarioRowRepository inventarioRowRepository) {
+        return new PickingInventarioViewModel(inventarioRepository, inventarioRowRepository);
+    }
+
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..cef1f930
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
@@ -0,0 +1,380 @@
+package it.integry.integrywmsnative.gest.inventario.picking;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+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.InventarioRowRoomDTO;
+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.exception.NoResultFromBarcodeException;
+import it.integry.integrywmsnative.core.expansion.RunnableArgss;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+import it.integry.integrywmsnative.core.rest.model.Ean128Model;
+import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
+import it.integry.integrywmsnative.core.rest.model.inventario.InventarioArtDTO;
+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.gest.spedizione.exceptions.InvalidPesoKGException;
+import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
+
+public class PickingInventarioViewModel {
+
+
+    private final InventarioRepository inventarioRepository;
+    private final InventarioRowRepository inventarioRowRepository;
+
+    public MutableLiveData<InventarioRoomDTO> currentInventario = new MutableLiveData<>();
+    public LiveData<List<InventarioRowRoomDTO>> currentInventarioRows = new MutableLiveData<>();
+
+    private List<InventarioArtDTO> availableInventarioArts;
+    private Listener mListener;
+
+    public PickingInventarioViewModel(
+            InventarioRepository inventarioRepository,
+            InventarioRowRepository inventarioRowRepository) {
+        this.inventarioRepository = inventarioRepository;
+        this.inventarioRowRepository = inventarioRowRepository;
+    }
+
+    public void init(InventarioRoomDTO inventarioRoomDTO, List<InventarioArtDTO> inventarioArts) {
+        this.currentInventario.postValue(inventarioRoomDTO);
+        this.currentInventarioRows = inventarioRowRepository.retrieve(inventarioRoomDTO.getId());
+        this.availableInventarioArts = inventarioArts == null ? new ArrayList<>() : inventarioArts;
+    }
+
+    public LiveData<InventarioRoomDTO> getCurrentInventario() {
+        return currentInventario;
+    }
+
+    public LiveData<List<InventarioRowRoomDTO>> getCurrentInventarioRows() {
+        return currentInventarioRows;
+    }
+
+    public List<InventarioArtDTO> getAvailableArts() {
+        return availableInventarioArts;
+    }
+
+    public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
+            //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
+            this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);
+
+        } else {
+            this.loadArticolo(barcodeScanDTO.getStringValue(), null, onComplete);
+        }
+    }
+
+    public void updateRow(InventarioRowRoomDTO itemToUpdate) {
+        var matchedArt = availableInventarioArts.stream()
+                .filter(x -> x.getCodMart().contains(itemToUpdate.getCodMart()))
+                .findFirst()
+                .orElse(null);
+
+        var articolo = matchedArt.toMtbAart();
+        articolo.setFlagTracciabilita("N");
+        dispatchRowEdit(articolo, itemToUpdate);
+    }
+
+    public void deleteRow(InventarioRowRoomDTO itemToDelete) {
+        this.inventarioRowRepository.delete(itemToDelete, () -> {
+        }, this::sendError);
+    }
+
+
+    public void exportAll(Runnable onComplete) {
+        currentInventario.getValue().setInventarioRowList(this.currentInventarioRows.getValue());
+        this.inventarioRepository.export(currentInventario.getValue(), onComplete, this::sendError);
+    }
+
+
+    private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        try {
+            Ean13PesoModel ean13PesoModel = Ean13PesoModel.fromBarcode(barcodeScanDTO.getStringValue());
+            this.loadArticolo(ean13PesoModel.getPrecode(), ean13PesoModel.toEan128(), onComplete);
+        } catch (Exception ex) {
+            this.sendError(ex);
+        }
+    }
+
+    private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Runnable onComplete) {
+        var matchedArts = availableInventarioArts.stream()
+                .filter(x -> x.getBarcode().contains(barcodeProd))
+                .collect(Collectors.toList());
+
+        if (matchedArts.size() > 0) {
+            this.dispatchRowInsert(matchedArts.get(0), ean128Model);
+            onComplete.run();
+
+        } else {
+            this.sendError(new NoResultFromBarcodeException(barcodeProd));
+        }
+    }
+
+
+    private void dispatchRowInsert(InventarioArtDTO inventarioArtDTO, Ean128Model ean128Model) {
+        var mtbAart = inventarioArtDTO.toMtbAart();
+        mtbAart.setFlagTracciabilita("N");
+
+        PickingObjectDTO pickingObjectDTO = new PickingObjectDTO()
+                .setMtbAart(mtbAart)
+                .setTempPickData(PickDataDTO.fromEan128(ean128Model));
+
+        BigDecimal numCnfDaPrelevare = null;
+        BigDecimal qtaColDaPrelevare = null;
+        BigDecimal qtaCnfDaPrelevare = null;
+
+        BigDecimal initialNumCnf;
+        BigDecimal initialQtaCnf;
+        BigDecimal initialQtaTot;
+
+        String partitaMag = null;
+        Date dataScad = null;
+
+        if (pickingObjectDTO.getTempPickData() != null && pickingObjectDTO.getTempPickData().getManualPickDTO() != null) {
+            //Oppure le info del barcode scansionato
+            PickDataDTO.ManualPickDTO manualPickDTO = pickingObjectDTO.getTempPickData().getManualPickDTO();
+
+            qtaColDaPrelevare = manualPickDTO.getQtaTot();
+            numCnfDaPrelevare = manualPickDTO.getNumCnf();
+
+            if (inventarioArtDTO.isPlu()) {
+//                if(inventarioArtDTO.getPrzVendIva().equals(BigDecimal.ZERO))
+//                    this.sendError();
+
+                qtaColDaPrelevare = UtilityBigDecimal.multiply(qtaColDaPrelevare, BigDecimal.TEN);
+                qtaColDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, inventarioArtDTO.getPrzVendIva(), RoundingMode.HALF_UP);
+            }
+
+            if (mtbAart.isFlagQtaCnfFissaBoolean()) {
+                qtaCnfDaPrelevare = mtbAart.getQtaCnf();
+
+                if (manualPickDTO.isEanPeso()) {
+                    if (mtbAart.getUntMisRifPeso() == MtbAart.UntMisRifPesoEnum.M) {
+                        if (UtilityBigDecimal.equalsTo(mtbAart.getPesoKg(), BigDecimal.ZERO)) {
+                            this.sendError(new InvalidPesoKGException());
+                        } else {
+                            qtaColDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, mtbAart.getPesoKg());
+                        }
+                    }
+                }
+
+            } else if (qtaColDaPrelevare != null && numCnfDaPrelevare != null) {
+                qtaCnfDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, numCnfDaPrelevare);
+            }
+
+
+            if (qtaColDaPrelevare != null && numCnfDaPrelevare == null) {
+                if (!mtbAart.isFlagQtaCnfFissaBoolean()) {
+                    numCnfDaPrelevare = UtilityBigDecimal.divideAndRoundToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf());
+                    if (UtilityBigDecimal.equalsTo(numCnfDaPrelevare, BigDecimal.ZERO))
+                        numCnfDaPrelevare = BigDecimal.ONE;
+                    qtaCnfDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, numCnfDaPrelevare);
+                } else {
+                    numCnfDaPrelevare = UtilityBigDecimal.divideToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf());
+                }
+
+            } else if (numCnfDaPrelevare != null && qtaColDaPrelevare == null) {
+                qtaCnfDaPrelevare = mtbAart.getQtaCnf();
+                qtaColDaPrelevare = UtilityBigDecimal.multiply(numCnfDaPrelevare, qtaCnfDaPrelevare);
+            }
+
+            if (manualPickDTO.getMtbPartitaMag() != null) {
+                partitaMag = manualPickDTO.getMtbPartitaMag().getPartitaMag();
+                dataScad = manualPickDTO.getMtbPartitaMag().getDataScadD();
+            }
+
+            initialNumCnf = numCnfDaPrelevare;
+            initialQtaCnf = qtaCnfDaPrelevare;
+            initialQtaTot = qtaColDaPrelevare;
+        } else {
+            initialNumCnf = BigDecimal.ONE;
+            initialQtaCnf = mtbAart.getQtaCnf();
+            initialQtaTot = UtilityBigDecimal.multiply(initialNumCnf, initialQtaCnf);
+        }
+
+        if (numCnfDaPrelevare == null && qtaColDaPrelevare == null && initialNumCnf == null && initialQtaTot == null) {
+            initialNumCnf = BigDecimal.ONE;
+            initialQtaCnf = mtbAart.getQtaCnf();
+            initialQtaTot = UtilityBigDecimal.multiply(initialNumCnf, initialQtaCnf);
+        }
+
+
+        this.sendOnItemDispatched(
+                pickingObjectDTO,
+                pickingObjectDTO.getMtbAart(),
+                initialNumCnf,
+                initialQtaCnf,
+                initialQtaTot,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                partitaMag,
+                dataScad,
+                false,
+                true,
+                false,
+                (pickedQuantityDTO, shouldCloseLU) -> {
+                    this.saveNewRow(pickingObjectDTO,
+                            pickedQuantityDTO.getNumCnf(),
+                            pickedQuantityDTO.getQtaCnf(),
+                            pickedQuantityDTO.getQtaTot(),
+                            pickedQuantityDTO.getPartitaMag(),
+                            pickedQuantityDTO.getDataScad());
+                });
+    }
+
+    private void dispatchRowEdit(MtbAart mtbAart, InventarioRowRoomDTO inventarioRowRoomDTO) {
+
+        final PickingObjectDTO pickingObjectDTO = new PickingObjectDTO()
+                .setMtbAart(mtbAart);
+
+
+        this.sendOnItemDispatched(
+                pickingObjectDTO,
+                pickingObjectDTO.getMtbAart(),
+                inventarioRowRoomDTO.getNumConf(),
+                inventarioRowRoomDTO.getQtaConf(),
+                inventarioRowRoomDTO.getQta(),
+                null, null, null,
+                null, null, null,
+                inventarioRowRoomDTO.getPartitaMag(),
+                null,
+                false,
+                false,
+                false,
+                (pickedQuantityDTO, shouldCloseLU) -> {
+
+                    this.saveEditedRow(inventarioRowRoomDTO,
+                            pickedQuantityDTO.getNumCnf(),
+                            pickedQuantityDTO.getQtaCnf(),
+                            pickedQuantityDTO.getQtaTot(),
+                            pickedQuantityDTO.getPartitaMag(),
+                            pickedQuantityDTO.getDataScad());
+                });
+
+    }
+
+
+    private void saveNewRow(PickingObjectDTO pickingObjectDTO, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, Date dataScad) {
+        final InventarioRowRoomDTO inventarioRow = new InventarioRowRoomDTO();
+        inventarioRow.setCodMart(pickingObjectDTO.getMtbAart().getCodMart());
+        inventarioRow.setDescrizione(pickingObjectDTO.getMtbAart().getDescrizioneEstesa());
+        inventarioRow.setPartitaMag(partitaMag);
+        inventarioRow.setQta(qtaTot);
+        inventarioRow.setNumConf(numCnf);
+        inventarioRow.setQtaConf(qtaCnf);
+        inventarioRow.setUntMis(pickingObjectDTO.getMtbAart().getUntMis());
+        inventarioRow.setDataOraInv(UtilityDate.getNowTime());
+        inventarioRow.setZona(currentInventario.getValue().getZona());
+        inventarioRow.setParentId(currentInventario.getValue().getId());
+
+        inventarioRowRepository.insert(inventarioRow, () -> {
+        }, this::sendError);
+    }
+
+    private void saveEditedRow(InventarioRowRoomDTO inventarioRowRoomDTO, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, Date dataScad) {
+        inventarioRowRoomDTO.setPartitaMag(partitaMag);
+        inventarioRowRoomDTO.setQta(qtaTot);
+        inventarioRowRoomDTO.setNumConf(numCnf);
+        inventarioRowRoomDTO.setQtaConf(qtaCnf);
+        inventarioRowRoomDTO.setDataOraInv(UtilityDate.getNowTime());
+
+        inventarioRowRepository.update(inventarioRowRoomDTO, () -> {
+        }, 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 sendOnItemDispatched(PickingObjectDTO pickingObjectDTO,
+                                      MtbAart mtbAart,
+                                      BigDecimal initialNumCnf,
+                                      BigDecimal initialQtaCnf,
+                                      BigDecimal initialQtaTot,
+                                      BigDecimal totalQtaAvailable,
+                                      BigDecimal totalNumCnfAvailable,
+                                      BigDecimal qtaCnfAvailable,
+                                      BigDecimal totalQtaToBeTaken,
+                                      BigDecimal totalNumCnfToBeTaken,
+                                      BigDecimal qtaCnfToBeTaken,
+                                      String partitaMag,
+                                      Date dataScad,
+                                      boolean canOverflowOrderQuantity,
+                                      boolean canPartitaMagBeChanged,
+                                      boolean canLUBeClosed,
+                                      RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
+        if (this.mListener != null) mListener.onItemDispatched(pickingObjectDTO,
+                mtbAart,
+                initialNumCnf,
+                initialQtaCnf,
+                initialQtaTot,
+                totalQtaAvailable,
+                totalNumCnfAvailable,
+                qtaCnfAvailable,
+                totalQtaToBeTaken,
+                totalNumCnfToBeTaken,
+                qtaCnfToBeTaken,
+                partitaMag,
+                dataScad,
+                canOverflowOrderQuantity,
+                canPartitaMagBeChanged,
+                canLUBeClosed,
+                onComplete);
+    }
+
+    public PickingInventarioViewModel setListener(Listener listener) {
+        this.mListener = listener;
+        return this;
+    }
+
+    public interface Listener extends ILoadingListener {
+
+        void onError(Exception ex);
+
+        void onItemDispatched(PickingObjectDTO pickingObjectDTO,
+                              MtbAart mtbAart,
+                              BigDecimal initialNumCnf,
+                              BigDecimal initialQtaCnf,
+                              BigDecimal initialQtaTot,
+                              BigDecimal totalQtaAvailable,
+                              BigDecimal totalNumCnfAvailable,
+                              BigDecimal qtaCnfAvailable,
+                              BigDecimal totalQtaToBeTaken,
+                              BigDecimal totalNumCnfToBeTaken,
+                              BigDecimal qtaCnfToBeTaken,
+                              String partitaMag,
+                              Date dataScad,
+                              boolean canOverflowOrderQuantity,
+                              boolean canPartitaMagBeChanged,
+                              boolean canLUBeClosed,
+                              RunnableArgss<PickedQuantityDTO, Boolean> onComplete);
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
index dd2d7314..eefe275b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
@@ -1,7 +1,10 @@
 package it.integry.integrywmsnative.gest.main;
 
 
+import android.animation.ArgbEvaluator;
+import android.animation.ObjectAnimator;
 import android.content.Context;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -71,6 +74,8 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
     private LayoutInflater mLayoutInflater;
 
+    private boolean easterEggToggle = false;
+
     public MainFragment() {
     }
 
@@ -85,18 +90,23 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        this.mLayoutInflater = inflater;
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
 
         MainApplication.appComponent
                 .mainFragmentComponent()
                 .create()
                 .inject(this);
+    }
 
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        this.mLayoutInflater = inflater;
         mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main, container, false);
+        mBindings.setView(this);
 
-
+        mBindings.easterEggHorrorBloodExpandableLayout.setExpanded(false, false);
         return mBindings.getRoot();
     }
 
@@ -301,4 +311,87 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
     public void addOnPreDestroy(Runnable onPreDestroy) {
         this.mOnPreDestroyList.add(onPreDestroy);
     }
+
+
+    public void toggleEasterEggMode() {
+        easterEggToggle =! easterEggToggle;
+
+
+        int rootBgStart, rootBgEnd;
+        int profileBgStart, profileBgEnd;
+        float titleFlipStart, titleFlipEnd;
+        int animationTimeMillis = 0;
+
+        if (easterEggToggle) {
+            rootBgStart = Color.argb(255, 255, 255, 255);
+            rootBgEnd = Color.argb(255, 0, 0, 0);
+
+            profileBgStart = Color.argb(255, 26, 115, 232);
+            profileBgEnd = Color.argb(255, 211, 47, 47);
+            animationTimeMillis = 2500;
+            titleFlipStart = 1f;
+            titleFlipEnd = -1f;
+        } else {
+            rootBgStart = Color.argb(255, 0, 0, 0);
+            rootBgEnd = Color.argb(255, 255, 255, 255);
+
+            profileBgStart = Color.argb(255, 211, 47, 47);
+            profileBgEnd = Color.argb(255, 26, 115, 232);
+            animationTimeMillis = 750;
+            titleFlipStart = -1f;
+            titleFlipEnd = 1f;
+        }
+
+        mBindings.easterEggHorrorBloodExpandableLayout.setDuration(animationTimeMillis);
+        mBindings.easterEggHorrorBloodExpandableLayout.setExpanded(easterEggToggle, true);
+
+        View rootActivityView = requireActivity().findViewById(R.id.drawer_layout);
+        ObjectAnimator colorFadeRootBg = ObjectAnimator.ofObject(rootActivityView, "backgroundColor",
+                new ArgbEvaluator(),
+                rootBgStart,
+                rootBgEnd);
+
+        colorFadeRootBg.setDuration(animationTimeMillis);
+        colorFadeRootBg.start();
+
+        View toolbarActivityView = requireActivity().findViewById(R.id.toolbar);
+        ObjectAnimator colorFadeToolbarBg = ObjectAnimator.ofObject(toolbarActivityView, "backgroundColor",
+                new ArgbEvaluator(),
+                rootBgStart,
+                rootBgEnd);
+
+        colorFadeToolbarBg.setDuration(animationTimeMillis);
+        colorFadeToolbarBg.start();
+
+        ObjectAnimator colorFadeProfileBg = ObjectAnimator.ofObject(mBindings.profileRootContainer, "backgroundColor",
+                new ArgbEvaluator(),
+                profileBgStart,
+                profileBgEnd);
+
+        colorFadeProfileBg.setDuration(animationTimeMillis);
+        colorFadeProfileBg.start();
+
+        View toolbarTitleActivityView = requireActivity().findViewById(R.id.toolbar_title);
+        ObjectAnimator flipToolbarTitleX = ObjectAnimator.ofFloat(toolbarTitleActivityView, "scaleX",
+                titleFlipStart,
+                titleFlipEnd);
+
+        flipToolbarTitleX.setDuration(animationTimeMillis);
+        flipToolbarTitleX.start();
+
+        ObjectAnimator flipToolbarTitleY = ObjectAnimator.ofFloat(toolbarTitleActivityView, "scaleY",
+                titleFlipStart,
+                titleFlipEnd);
+
+        flipToolbarTitleY.setDuration(animationTimeMillis);
+        flipToolbarTitleY.start();
+
+        ObjectAnimator colorFadeTitleTextColor = ObjectAnimator.ofObject(toolbarTitleActivityView, "textColor",
+                new ArgbEvaluator(),
+                rootBgEnd,
+                rootBgStart);
+
+        colorFadeTitleTextColor.setDuration(animationTimeMillis);
+        colorFadeTitleTextColor.start();
+    }
 }
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 9f558e1b..b68f73c7 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
@@ -164,7 +164,6 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
 
     private void initBottomSheet() {
         mBindings.bottomSheetMtbColrEdit.setListener(this);
-        mBindings.bottomSheetMtbColrEdit.init(mBindings.bottomSheetMtbColrEdit, mBindings.bottomSheetMtbColrEditBackground);
     }
 
 
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 075e8628..b7fd2278 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
@@ -52,7 +52,7 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
 import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
-import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialog;
+import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLU;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 
@@ -121,7 +121,6 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
         mBindings.setLifecycleOwner(this);
         mBindings.setPickingResiView(this);
 
-        mBindings.bottomSheetLuContent.init(mBindings.bottomSheetLuContent, null);
         mBottomSheetFragmentLUContentViewModel = mBindings.bottomSheetLuContent.getViewModelInstance();
         mBindings.bottomSheetLuContent.setListener(this);
         mBottomSheetFragmentLUContentViewModel.setListener(this);
@@ -277,7 +276,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
 
     @Override
     public void onInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete) {
-        InfoAggiuntiveLUDialog.newInstance(onComplete).show(getSupportFragmentManager(), "InfoAggiuntiveLUDialog");
+        DialogInfoAggiuntiveLU.newInstance(onComplete).show(getSupportFragmentManager(), "InfoAggiuntiveLUDialog");
     }
 
     @Override
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 14782e1d..b92300de 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
@@ -185,7 +185,6 @@ public class ProdRientroMerceFragment extends BaseFragment implements
     private void initBottomSheet() {
         mBindings.bottomSheetMtbColrEdit.setListener(this);
         mBindings.bottomSheetMtbColrEdit.disableEditButton();
-        mBindings.bottomSheetMtbColrEdit.init(mBindings.bottomSheetMtbColrEdit, mBindings.bottomSheetMtbColrEditBackground);
     }
 
     @Override
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 cdb6807f..fd6eb9be 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
@@ -36,7 +36,7 @@ import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.FragmentPvOrdiniAcquistoBinding;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity;
-import it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs.DialogScanLisAView;
+import it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs.DialogScanGrigliaAcquistoView;
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.ui.OrdineAcquistoPvOpenListAdapter;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
 import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
@@ -99,7 +99,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends BaseFragment implements ITi
 
     private void init() {
         BarcodeManager.enable();
-        DialogScanLisAView.newInstance(griglia -> {
+        DialogScanGrigliaAcquistoView.newInstance(griglia -> {
             if (griglia == null) {
                 ((IPoppableActivity) requireActivity()).pop();
             } else {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoComponent.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoComponent.java
new file mode 100644
index 00000000..0e54bb2d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogScanGrigliaAcquistoComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogScanGrigliaAcquistoComponent create();
+    }
+
+    void inject(DialogScanGrigliaAcquistoView dialogScanLisAView);
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisAView.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java
similarity index 94%
rename from app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisAView.java
rename to app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java
index 18464383..a4ac0d1e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisAView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java
@@ -31,7 +31,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.consumers.PVOrdiniAcquistoRESTConsumer;
 import it.integry.integrywmsnative.databinding.DialogScanCodiceGrigliaBinding;
 
-public class DialogScanLisAView extends BaseDialogFragment {
+public class DialogScanGrigliaAcquistoView extends BaseDialogFragment {
 
     private DialogScanCodiceGrigliaBinding mBinding;
     private int mBarcodeScannerIstanceID;
@@ -50,11 +50,11 @@ public class DialogScanLisAView extends BaseDialogFragment {
     private Griglia mGriglia;
 
 
-    public static DialogScanLisAView newInstance(RunnableArgs<Griglia> onDialogDismiss) {
-        return new DialogScanLisAView(onDialogDismiss);
+    public static DialogScanGrigliaAcquistoView newInstance(RunnableArgs<Griglia> onDialogDismiss) {
+        return new DialogScanGrigliaAcquistoView(onDialogDismiss);
     }
 
-    private DialogScanLisAView(RunnableArgs<Griglia> onDialogDismiss) {
+    private DialogScanGrigliaAcquistoView(RunnableArgs<Griglia> onDialogDismiss) {
         super();
         mOnDialogDismiss = onDialogDismiss;
     }
@@ -71,6 +71,7 @@ public class DialogScanLisAView extends BaseDialogFragment {
 
         mBinding = DataBindingUtil.inflate(LayoutInflater.from(requireContext()), R.layout.dialog_scan_codice_griglia, null, false);
         mBinding.setLifecycleOwner(this);
+        mBinding.setView(this);
 
         var alertDialogBuilder = new MaterialAlertDialogBuilder(requireContext())
                 .setView(mBinding.getRoot())
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisAComponent.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisAComponent.java
deleted file mode 100644
index 35d52963..00000000
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisAComponent.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs;
-
-import dagger.Subcomponent;
-
-@Subcomponent
-public interface DialogScanLisAComponent {
-
-    @Subcomponent.Factory
-    interface Factory {
-        DialogScanLisAComponent create();
-    }
-
-    void inject(DialogScanLisAView dialogScanLisAView);
-}
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 3d7b65ca..cec2e443 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
@@ -11,6 +11,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
@@ -56,7 +57,6 @@ import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
-import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArtsView;
@@ -84,8 +84,6 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
     private int barcodeScannerIstanceID = -1;
 
-    private DialogProgressView mCurrentProgress;
-
     public RettificaGiacenzeFragment() {
         // Required empty public constructor
     }
@@ -109,16 +107,23 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
 
-        mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_main_rettifica_giacenze, container, false);
         MainApplication.appComponent
                 .rettificaGiacenzeComponent()
                 .create()
                 .inject(this);
 
         mViewModel.setListener(this);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_main_rettifica_giacenze, container, false);
+
 
         mBinding.setLifecycleOwner(this);
         mBinding.setView(this);
@@ -149,7 +154,6 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
     private void initBottomSheet() {
         mBinding.bottomSheetMtbColrEdit.setListener(this);
-        mBinding.bottomSheetMtbColrEdit.init(mBinding.bottomSheetMtbColrEdit, mBinding.bottomSheetMtbColrEditBackground);
     }
 
     private void initRecyclerView() {
@@ -196,16 +200,9 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
         mViewModel.init(
                 SettingsManager.i().getUser().getFullname(),
-                SettingsManager.iDB().getDefaultCausaleRettificaGiacenze(),
                 SettingsManager.i().getUserSession().getDepo().getCodMdep());
     }
 
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-    }
-
     @Override
     public void onCreateActionBar(AppCompatTextView titleText, Context context) {
         titleText.setText(context.getText(R.string.rettifica_giacenze_fragment_title).toString());
@@ -459,7 +456,6 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                         () -> onComplete.run(true),
                         () -> onComplete.run(false))
                 .show(getActivity().getSupportFragmentManager(), "tag");
-        ;
     }
 
     @Override
@@ -475,7 +471,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
     @Override
     public void onLUPositionChangeRequest(RunnableArgss<Boolean, MtbDepoPosizione> onComplete) {
-        new DialogYesNoView(null, "Vuoi cambiare la posizione della UL corrente?", result -> {
+        DialogYesNoView.newInstance(null, "Vuoi cambiare la posizione della UL corrente?", result -> {
             switch (result) {
                 case YES:
                     DialogAskPositionOfLUView.makeBase(false, (status, mtbDepoPosizione) -> {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
index 7c4b0a82..dc697c0c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
@@ -51,7 +51,6 @@ public class RettificaGiacenzeViewModel {
     private RettificaGiacenzeViewModel.Listener mListener;
 
     private String mCurrentUser;
-    private String mDefaultCausale;
     private String mCurrentCodMdep;
     private boolean mIsCreatedLU;
 
@@ -71,9 +70,8 @@ public class RettificaGiacenzeViewModel {
     }
 
 
-    public void init(String currentUser, String defaultCausale, String currentCodMdep) {
+    public void init(String currentUser, String currentCodMdep) {
         this.mCurrentUser = currentUser;
-        this.mDefaultCausale = defaultCausale;
         this.mCurrentCodMdep = currentCodMdep;
 
         this.sendOnLoadingStarted();
@@ -442,7 +440,7 @@ public class RettificaGiacenzeViewModel {
                             }, this::sendError);
                 };
 
-                if (!UtilityString.isNullOrEmpty(mDefaultCausale) && (saveCausale || mAnyEditDone)) {
+                if (saveCausale || mAnyEditDone) {
                     this.saveCausaleRettificaGiacenze(saveAction);
                 } else {
                     saveAction.run();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/ui/RettificaGiacenzeMainListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/ui/RettificaGiacenzeMainListAdapter.java
index 143bbc23..bea7a0a5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/ui/RettificaGiacenzeMainListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/ui/RettificaGiacenzeMainListAdapter.java
@@ -44,7 +44,6 @@ public class RettificaGiacenzeMainListAdapter extends ExtendedRecyclerView<MtbCo
     public RettificaGiacenzeMainListAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         // create a new view
         ListaRettificaGiacenzeModelBinding viewDataBinding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.lista_rettifica_giacenze_model, parent, false);
-
         return new ViewHolder(viewDataBinding);
     }
 
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 d67e88d0..19d38d9d 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
@@ -74,8 +74,8 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArtsView;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotView;
-import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialog;
-import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLuView;
+import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLU;
+import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtView;
@@ -188,7 +188,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         mBindings.setLifecycleOwner(this);
         mBindings.setSpedizioneView(this);
 
-        mBindings.bottomSheetLuContent.init(mBindings.bottomSheetLuContent, null);
         mBottomSheetFragmentLUContentViewModel = mBindings.bottomSheetLuContent.getViewModelInstance();
         mBindings.bottomSheetLuContent.setListener(this);
         mBottomSheetFragmentLUContentViewModel.setListener(this);
@@ -224,6 +223,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 useQtaOrd);
     }
 
+    
+
     private boolean isOrdTrasf() {
 
         return mTestateOrdini != null && !mTestateOrdini.isEmpty() && Stream.of(mTestateOrdini)
@@ -722,13 +723,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onLUPesoRequired(String codTcol, BigDecimal netWeightKG, BigDecimal grossWeightKG, RunnableArgsss<String, BigDecimal, BigDecimal> onComplete) {
-//        DialogInputPesoView.make(this, codTcol, netWeightKG, grossWeightKG, (newCodTcol, newNetWeight, newGrossWeight) -> {
-//            onComplete.run(newCodTcol, netWeightKG, grossWeightKG);
-//        }).show();
-
-
-        new DialogInputPesoLuView(null, new BigDecimal(50), new BigDecimal(55), (newCodTcol, newNetWeight, newGrossWeight) -> {
-//            onComplete.run(newCodTcol, netWeightKG, grossWeightKG);
+        DialogInputPesoLUView.newInstance(null, new BigDecimal(50), new BigDecimal(55), (newCodTcol, newNetWeight, newGrossWeight) -> {
+            onComplete.run(newCodTcol, netWeightKG, grossWeightKG);
         })
                 .show(getSupportFragmentManager(), "tag");
     }
@@ -862,7 +858,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onLUPositionChangeRequest(RunnableArgss<Boolean, MtbDepoPosizione> onComplete) {
-        new DialogYesNoView(null, "Vuoi cambiare la posizione della UL corrente?", result -> {
+        DialogYesNoView.newInstance(null, "Vuoi cambiare la posizione della UL corrente?", result -> {
             switch (result) {
                 case YES:
                     DialogAskPositionOfLUView.makeBase(false, (status, mtbDepoPosizione) -> {
@@ -929,7 +925,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onCreateDocsRequest() {
-        new DialogYesNoView("Chiusura ordine", "Vuoi creare i documenti per gli ordini selezionati?", result -> {
+        DialogYesNoView.newInstance("Chiusura ordine", "Vuoi creare i documenti per gli ordini selezionati?", result -> {
             this.mViewmodel.onCreateDocsAnswered(result);
         }).show(this.getSupportFragmentManager(), "tag");
     }
@@ -984,6 +980,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onInfoAggiuntiveRequired(MtbColt mtbColt, RunnableArgss<String, MtbTCol> onComplete) {
-        InfoAggiuntiveLUDialog.newInstance(mtbColt, onComplete).show(getSupportFragmentManager(), "InfoAggiuntiveLUDialog");
+        DialogInfoAggiuntiveLU.newInstance(mtbColt, onComplete).show(getSupportFragmentManager(), "InfoAggiuntiveLUDialog");
     }
 }
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 4e063ded..d660632b 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
@@ -698,7 +698,14 @@ public class SpedizioneViewModel {
 
             List<MtbColr> scannedMtbColrs = pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr();
 
-            List<MtbPartitaMag> availableBatchLots = Stream.of(scannedMtbColrs).filter(x -> x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) && (x.getPartitaMag() == null || UtilityString.isNullOrEmpty(x.getMtbPartitaMag().getDataScadS()) || UtilityDate.getDateInstance().before(x.getMtbPartitaMag().getDataScadD()))).distinctBy(MtbColr::getPartitaMag).map(x -> x.getPartitaMag() == null ? new MtbPartitaMag().setCodMart(x.getMtbAart().getCodMart()) : x.getMtbPartitaMag()).toList();
+            List<MtbPartitaMag> availableBatchLots = Stream.of(scannedMtbColrs)
+                    .filter(x ->
+                            x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) &&
+                                    (x.getPartitaMag() == null ||
+                                            UtilityString.isNullOrEmpty(x.getMtbPartitaMag().getDataScadS()) ||
+                                            UtilityDate.getDateInstance().before(x.getMtbPartitaMag().getDataScadD())))
+                    .distinctBy(MtbColr::getPartitaMag)
+                    .map(x -> x.getPartitaMag() == null ? new MtbPartitaMag().setCodMart(x.getMtbAart().getCodMart()) : x.getMtbPartitaMag()).toList();
 
             //Controllo se una delle partite combacia con quella che voglio evadere
             if (refMtbColr != null && refMtbColr.getMtbPartitaMag() != null) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java
index f75733e3..b3de49d5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java
@@ -1,26 +1,18 @@
 package it.integry.integrywmsnative.gest.ultime_consegne_cliente.rest;
 
-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 javax.inject.Singleton;
 
-import it.integry.integrywmsnative.core.model.GtbAnag;
-import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
-import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.DtbDocr;
-import it.integry.integrywmsnative.core.model.MtbAart;
-import it.integry.integrywmsnative.core.utility.UtilityDB;
-import it.integry.integrywmsnative.core.utility.UtilityQuery;
-import it.integry.integrywmsnative.gest.picking_resi.rest.WithdrawableDtbDocr;
+import it.integry.integrywmsnative.core.model.GtbAnag;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO;
+import it.integry.integrywmsnative.core.utility.UtilityDB;
 
 @Singleton
 public class UltimeConsegneClienteRESTConsumer {
@@ -72,155 +64,4 @@ public class UltimeConsegneClienteRESTConsumer {
         });
     }
 
-
-    public static void loadDocRowFromConsegna(List<DocumentoResoDTO> consegne, RunnableArgs<ArrayList<WithdrawableDtbDocr>> onComplete, RunnableArgs<Exception> onFailed) {
-        List<HashMap<String, Object>> filterCond = new ArrayList<>();
-
-        for (int i = 0; i < consegne.size(); i++) {
-            HashMap<String, Object> filter = new HashMap<>();
-
-            filter.put("dtb_docr.data_doc", consegne.get(i).getDataDocD());
-            filter.put("dtb_docr.num_doc", consegne.get(i).getNumDoc());
-            filter.put("dtb_docr.ser_doc", consegne.get(i).getSerDoc());
-            filter.put("dtb_docr.cod_anag", consegne.get(i).getCodAnag());
-            filter.put("dtb_docr.cod_dtip", consegne.get(i).getCodDtip());
-
-            filterCond.add(filter);
-        }
-
-        String sql = "SELECT dtb_docr.[cod_anag]" +
-                "      ,dtb_docr.[cod_dtip]" +
-                "      ,dtb_docr.[data_doc]" +
-                "      ,dtb_docr.[ser_doc]" +
-                "      ,dtb_docr.[num_doc]" +
-                "      ,dtb_docr.[id_riga]" +
-                "      ,dtb_docr.[cod_mart]" +
-                "      ,dtb_docr.[descrizione]" +
-                "      ,dtb_docr.[unt_doc]" +
-                "      ,(dtb_docr.[rap_conv] / dtb_docr.[rap_conv]) as rap_conv" +
-                "      ,(dtb_docr.[qta_doc] * dtb_docr.[rap_conv]) - ISNULL(mtb_colr.qta_col, 0) as qta_doc" +
-                "      ,dtb_docr.[val_unt]" +
-                "      ,dtb_docr.[sconto5]" +
-                "      ,dtb_docr.[sconto6]" +
-                "      ,dtb_docr.[sconto7]" +
-                "      ,dtb_docr.[sconto8]" +
-                "      ,dtb_docr.[cod_aliq]" +
-                "      ,dtb_docr.[perc_prov]" +
-                "      ,dtb_docr.[val_prov]" +
-                "      ,dtb_docr.[data_ord]" +
-                "      ,dtb_docr.[num_ord]" +
-                "      ,dtb_docr.[riga_ord]" +
-                "      ,dtb_docr.[importo_riga]" +
-                "      ,dtb_docr.[cod_col]" +
-                "      ,dtb_docr.[cod_tagl]" +
-                "      ,dtb_docr.[cod_jcom]" +
-                "      ,dtb_docr.[cod_mdep]" +
-                "      ,dtb_docr.[perc_gest]" +
-                "      ,dtb_docr.[val_gest]" +
-                "      ,dtb_docr.[partita_mag]" +
-                "      ,dtb_docr.[val_unt_iva]" +
-                "      ,dtb_docr.[qta_cnf]" +
-                "      ,dtb_docr.[descrizione_estesa]" +
-                "      ,dtb_docr.[costo_unt]" +
-                "      ,dtb_docr.[perc_ispe]" +
-                "      ,dtb_docr.[val_ispe]" +
-                "      ,dtb_docr.[perc_promo]" +
-                "      ,dtb_docr.[val_promo]" +
-                "      ,dtb_docr.[perc_oneri]" +
-                "      ,dtb_docr.[val_oneri]" +
-                "      ,dtb_docr.[flag_evaso_forzato]" +
-                "      ,dtb_docr.[cod_dtip_comp]" +
-                "      ,dtb_docr.[data_doc_comp]" +
-                "      ,dtb_docr.[ser_doc_comp]" +
-                "      ,dtb_docr.[num_doc_comp]" +
-                "      ,dtb_docr.[cod_promo]" +
-                "      ,dtb_docr.[perc_prov2]" +
-                "      ,dtb_docr.[val_prov2]" +
-                "      ,dtb_docr.[cod_art_for]" +
-                "      ,dtb_docr.[unt_doc2]" +
-                "      ,dtb_docr.[qta_doc2]" +
-                "      ,dtb_docr.[unt_doc3]" +
-                "      ,dtb_docr.[qta_doc3]" +
-                "      ,dtb_docr.[num_cnf]" +
-                "      ,dtb_docr.[peso_lordo]" +
-                "      ,dtb_docr.[posizione]" +
-                "      ,dtb_docr.[cod_anag_comp]" +
-                "      ,dtb_docr.[cod_mtip]" +
-                "      ,dtb_docr.[matricola]" +
-                "      ,dtb_docr.[data_iniz_comp]" +
-                "      ,dtb_docr.[data_fine_comp]" +
-                "      ,dtb_docr.[cod_kit]" +
-                "      ,dtb_docr.[cod_alis]" +
-                "      ,dtb_docr.[data_ins_row]" +
-                "      ,dtb_docr.[note] " +
-                "      ,dtb_doct.[gestione] " +
-                "FROM dtb_docr " +
-                "INNER JOIN dtb_doct ON dtb_docr.num_doc = dtb_doct.num_doc AND dtb_docr.data_doc = dtb_doct.data_doc AND dtb_docr.cod_anag = dtb_doct.cod_anag AND dtb_docr.cod_dtip = dtb_doct.cod_dtip AND dtb_docr.ser_doc = dtb_doct.ser_doc " +
-                "INNER JOIN mtb_aart ON dtb_docr.cod_mart = mtb_aart.cod_mart " +
-                "LEFT OUTER JOIN ctb_cont ON mtb_aart.cod_ccon_ricavi = ctb_cont.cod_ccon " +
-                "LEFT OUTER JOIN ctb_grup ON ctb_cont.cod_cgrp = ctb_grup.cod_cgrp " +
-                "LEFT OUTER JOIN mtb_colr ON " +
-                " dtb_docr.cod_anag = mtb_colr.cod_anag_doc AND " +
-                " dtb_docr.cod_dtip = mtb_colr.cod_dtip_doc AND " +
-                " dtb_docr.ser_doc = mtb_colr.ser_doc AND " +
-                " dtb_docr.data_doc = mtb_colr.data_doc AND " +
-                " dtb_docr.num_doc = mtb_colr.num_doc AND " +
-                " dtb_docr.id_riga = mtb_colr.id_riga_doc " +
-                "WHERE " +
-                "   (ctb_grup.sezione <> 1 OR ctb_grup.sezione IS NULL) AND " +
-                "   dtb_docr.[qta_doc] - ISNULL(mtb_colr.qta_col, 0) > 0 AND" +
-                "   ( " +
-                UtilityQuery.concatFieldListInWhereCond(filterCond) +
-                "   ) " +
-                "ORDER BY cod_mart";
-
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<WithdrawableDtbDocr>>() {
-        }.getType();
-        SystemRESTConsumer.processSqlStatic(sql, typeOfObjectsList, new ISimpleOperationCallback<ArrayList<WithdrawableDtbDocr>>() {
-            @Override
-            public void onSuccess(ArrayList<WithdrawableDtbDocr> values) {
-
-                if (values != null && values.size() > 0) {
-                    List<String> codMarts = Stream.of(values)
-                            .map(DtbDocr::getCodMart)
-                            .withoutNulls()
-                            .distinct()
-                            .toList();
-
-                    ArticoloRESTConsumer.getByCodMartsStatic(codMarts, arts -> {
-
-                        if (arts != null && arts.size() > 0) {
-                            for (DtbDocr value : values) {
-
-                                MtbAart foundMtbAart = null;
-
-                                List<MtbAart> mtbAartStream = Stream.of(arts)
-                                        .filter(x -> x.getCodMart().equalsIgnoreCase(value.getCodMart())).toList();
-
-                                if (mtbAartStream != null && mtbAartStream.size() > 0) {
-                                    foundMtbAart = mtbAartStream.get(0);
-                                }
-
-                                value.setMtbAart(foundMtbAart);
-                            }
-
-
-                            if (onComplete != null) onComplete.run(values);
-                        }
-
-                    }, onFailed);
-
-                } else {
-                    if (onComplete != null) onComplete.run(values);
-                }
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                if (onFailed != null) onFailed.run(ex);
-            }
-        });
-    }
-
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__base/BottomSheetFragmentBaseView.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__base/BottomSheetFragmentBaseView.java
index 7720e652..d2765734 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__base/BottomSheetFragmentBaseView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__base/BottomSheetFragmentBaseView.java
@@ -3,12 +3,14 @@ package it.integry.integrywmsnative.view.bottom_sheet__base;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 
+import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.view.bottom_sheet__base.exceptions.BottomSheetFragmentViewNotInitializedException;
 
@@ -16,16 +18,31 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout {
 
     protected Context mContext;
     protected View parentView;
+    protected View backgroundView;
+    protected int backgroundViewId;
 
-    protected BottomSheetBehavior mBottomSheetBehavior;
+    protected BottomSheetBehavior<?> mBottomSheetBehavior;
 
-    public BottomSheetFragmentBaseView(Context context) {
-        this(context, null);
-    }
 
     public BottomSheetFragmentBaseView(Context context, AttributeSet attrs) {
         super(context, attrs);
         this.mContext = context;
+
+        int backgroundViewId = attrs.getAttributeResourceValue("http://schemas.android.com/apk/res-auto", "backgroundView", -1);
+        int parentViewId = attrs.getAttributeResourceValue("http://schemas.android.com/apk/res-auto", "parentView", -1);
+
+//        if(backgroundViewId == -1)
+//            throw new RuntimeException("Please declare app:backgroundView on BottomSheet");
+
+        if (parentViewId == -1)
+            throw new RuntimeException("Please declare app:parentView on BottomSheet");
+
+
+        this.init(
+                getRootView().findViewById(parentViewId),
+                null,
+                backgroundViewId);
+
     }
 
     public BottomSheetFragmentBaseView(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -36,14 +53,41 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout {
         this(context, attrs);
     }
 
+    private void init(View parentView, View backgroundView, int backgroundViewId) {
+        this.parentView = parentView;
+//        this.backgroundView = backgroundView;
+//        this.backgroundViewId = backgroundViewId;
+    }
 
-    public void init(View view, View backgroundView) {
-        this.parentView = view;
-        this.mBottomSheetBehavior = BottomSheetBehavior.from(this.parentView);
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        this.mBottomSheetBehavior = AutoCloseBottomSheetBehavior.from(this.parentView);
 
         this.mBottomSheetBehavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
             @Override
             public void onStateChanged(@NonNull View bottomSheet, int newState) {
+//                if(backgroundViewId != -1) {
+//                    backgroundView = ((View) getParent()).findViewById(backgroundViewId);
+//                }
+
+                if (backgroundView == null) {
+                    var rootView = getRootParent((ViewGroup) getParent());
+                    backgroundView = rootView.findViewById(R.id.bottom_sheet__background);
+                    backgroundView.setOnClickListener(v -> {
+                        collapse();
+                    });
+
+//                    backgroundView = new View(mContext, null);
+//                    backgroundView.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background_color));
+//                    backgroundView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+//                    backgroundView.setElevation(UtilityDimension.convertDpToPixel(0, mContext));
+//                    backgroundView.setAlpha(0.6f);
+
+//                    rootView.addView(backgroundView, 0);
+                }
+
                 if (newState == BottomSheetBehavior.STATE_COLLAPSED && backgroundView != null)
                     backgroundView.setVisibility(View.GONE);
 
@@ -52,7 +96,7 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout {
 
             @Override
             public void onSlide(@NonNull View bottomSheet, float slideOffset) {
-                if(backgroundView != null) {
+                if (backgroundView != null) {
                     backgroundView.setVisibility(View.VISIBLE);
                     backgroundView.setAlpha(slideOffset);
                 }
@@ -62,8 +106,27 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout {
         });
     }
 
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+
+    }
+
+
+    private ViewGroup getRootParent(ViewGroup viewGroup) {
+        if (viewGroup.getParent() != null && viewGroup.getParent() instanceof ViewGroup) {
+            var parent = (ViewGroup) viewGroup.getParent();
+
+            if (parent != null)
+                return getRootParent(parent);
+        }
+
+        return viewGroup;
+    }
+
     public void expand() {
-        if(this.mBottomSheetBehavior == null) {
+        if (this.mBottomSheetBehavior == null) {
             UtilityLogger.error(new BottomSheetFragmentViewNotInitializedException());
             return;
         }
@@ -72,7 +135,7 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout {
     }
 
     public void collapse() {
-        if(this.mBottomSheetBehavior == null) {
+        if (this.mBottomSheetBehavior == null) {
             UtilityLogger.error(new BottomSheetFragmentViewNotInitializedException());
             return;
         }
@@ -90,7 +153,7 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout {
 
 
     public State getState() {
-        if(this.mBottomSheetBehavior == null) {
+        if (this.mBottomSheetBehavior == null) {
             UtilityLogger.error(new BottomSheetFragmentViewNotInitializedException());
             return null;
         }
@@ -99,17 +162,17 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout {
     }
 
     public void toggle() {
-        if(isExpanded()) collapse();
+        if (isExpanded()) collapse();
         else expand();
     }
 
     protected State mapState(int stateInt) {
-        if(stateInt == BottomSheetBehavior.STATE_DRAGGING) return State.DRAGGING;
-        if(stateInt == BottomSheetBehavior.STATE_SETTLING) return State.SETTLING;
-        if(stateInt == BottomSheetBehavior.STATE_EXPANDED) return State.EXPANDED;
-        if(stateInt == BottomSheetBehavior.STATE_COLLAPSED) return State.COLLAPSED;
-        if(stateInt == BottomSheetBehavior.STATE_HIDDEN) return State.HIDDEN;
-        if(stateInt == BottomSheetBehavior.STATE_HALF_EXPANDED) return State.HALF_EXPANDED;
+        if (stateInt == BottomSheetBehavior.STATE_DRAGGING) return State.DRAGGING;
+        if (stateInt == BottomSheetBehavior.STATE_SETTLING) return State.SETTLING;
+        if (stateInt == BottomSheetBehavior.STATE_EXPANDED) return State.EXPANDED;
+        if (stateInt == BottomSheetBehavior.STATE_COLLAPSED) return State.COLLAPSED;
+        if (stateInt == BottomSheetBehavior.STATE_HIDDEN) return State.HIDDEN;
+        if (stateInt == BottomSheetBehavior.STATE_HALF_EXPANDED) return State.HALF_EXPANDED;
 
         return null;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditComponent.java
new file mode 100644
index 00000000..99839e0c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditComponent.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.view.bottom_sheet__item_edit;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface BottomSheetItemEditComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        BottomSheetItemEditComponent create();
+    }
+
+    void inject(BottomSheetItemEditView bottomSheetItemEditView);
+
+}
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
new file mode 100644
index 00000000..3d07199b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditDTO.java
@@ -0,0 +1,58 @@
+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/BottomSheetItemEditModule.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditModule.java
new file mode 100644
index 00000000..c750b310
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.bottom_sheet__item_edit;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = BottomSheetItemEditComponent.class)
+public class BottomSheetItemEditModule {
+
+    @Provides
+    BottomSheetItemEditViewModel providesBottomSheetItemEditViewModel() {
+        return new BottomSheetItemEditViewModel();
+    }
+
+}
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
new file mode 100644
index 00000000..cfd2ca9c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditView.java
@@ -0,0 +1,108 @@
+package it.integry.integrywmsnative.view.bottom_sheet__item_edit;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+
+import androidx.databinding.ObservableField;
+
+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 {
+
+
+    @Inject
+    BottomSheetItemEditViewModel mViewModel;
+
+    public ObservableField<Boolean> enabledEditButton = new ObservableField<>(true);
+    public ObservableField<Boolean> enabledDeleteButton = new ObservableField<>(true);
+
+    private final BottomSheetItemEditViewBinding mBinding;
+    private Listener mListener;
+
+    public BottomSheetItemEditView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mBinding = BottomSheetItemEditViewBinding.inflate(LayoutInflater.from(context), this, true);
+
+        MainApplication.appComponent
+                .bottomSheetItemEditComponent()
+                .create()
+                .inject(this);
+
+
+
+        mBinding.setViewModel(mViewModel);
+        mBinding.setView(this);
+    }
+
+    public BottomSheetItemEditView setItem(BottomSheetItemEditDTO item) {
+        this.mBinding.invalidateAll();
+
+        this.mViewModel.init(item);
+
+        this.mBinding.executePendingBindings();
+        this.parentView.requestLayout();
+
+        return this;
+    }
+
+    public BottomSheetItemEditView enableEditButton() {
+        this.enabledEditButton.set(true);
+        return this;
+    }
+
+    public BottomSheetItemEditView disableEditButton() {
+        this.enabledEditButton.set(false);
+        return this;
+    }
+
+    public BottomSheetItemEditView enableDeleteButton() {
+        this.enabledDeleteButton.set(true);
+        return this;
+    }
+
+    public BottomSheetItemEditView disableDeleteButton() {
+        this.enabledDeleteButton.set(false);
+        return this;
+    }
+
+
+
+    public void editItem() {
+        if(this.mListener != null) this.mListener.onItemEdit();
+        this.collapse();
+    }
+
+    public void deleteItem() {
+        if(this.mListener != null) this.mListener.onItemDelete();
+        this.collapse();
+    }
+
+
+
+    @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) {
+        this.mListener = listener;
+        return this;
+    }
+
+    public interface Listener {
+        void onItemEdit();
+
+        void onItemDelete();
+    }
+}
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
new file mode 100644
index 00000000..0b7395b6
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__item_edit/BottomSheetItemEditViewModel.java
@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.view.bottom_sheet__item_edit;
+
+import androidx.lifecycle.MutableLiveData;
+
+public class BottomSheetItemEditViewModel {
+
+    private final MutableLiveData<BottomSheetItemEditDTO> mCurrentItem = new MutableLiveData<>();
+
+    public void init(BottomSheetItemEditDTO item) {
+        this.mCurrentItem.postValue(item);
+    }
+
+    public MutableLiveData<BottomSheetItemEditDTO> getCurrentItem() {
+        return mCurrentItem;
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java
index 54514c3e..7bd1451a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java
@@ -42,7 +42,6 @@ public class BottomSheetFragmentLUContentView extends BottomSheetFragmentBaseVie
         mBinding.setViewModel(mViewModel);
 
         mBinding.bottomSheetMtbColrEdit.setListener(this);
-        mBinding.bottomSheetMtbColrEdit.init(mBinding.bottomSheetMtbColrEdit, mBinding.bottomSheetMtbColrEditBackground);
 
         mBinding.titleLayout.setOnClickListener(new OnSingleClickListener() {
             @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditView.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditView.java
index ef02a59a..70f7ec55 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditView.java
@@ -16,8 +16,8 @@ import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.exceptions.N
 
 public class BottomSheetMtbColrEditView extends BottomSheetFragmentBaseView {
 
-    private BottomSheetMtbColrEditBinding mBinding;
-    private BottomSheetMtbColrEditViewModel mViewModel;
+    private final BottomSheetMtbColrEditBinding mBinding;
+    private final BottomSheetMtbColrEditViewModel mViewModel;
 
     public ObservableField<Boolean> enabledEditButton = new ObservableField<>(true);
     public ObservableField<Boolean> enabledDeleteButton = new ObservableField<>(true);
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditViewModel.java
index d237c14c..019096b1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditViewModel.java
@@ -6,7 +6,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 
 public class BottomSheetMtbColrEditViewModel {
 
-    private ObservableField<MtbColr> mtbColr = new ObservableField<>();
+    private final ObservableField<MtbColr> mtbColr = new ObservableField<>();
 
 
     public MtbColr getMtbColr() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/InfoAggiuntiveLUDialog.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLU.java
similarity index 94%
rename from app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/InfoAggiuntiveLUDialog.java
rename to app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLU.java
index 9c6bf1da..fa732a2d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/InfoAggiuntiveLUDialog.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLU.java
@@ -35,7 +35,7 @@ import it.integry.integrywmsnative.databinding.DialogNoteAggiuntiveNuovaUlBindin
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.adapter.DialogInputLUProdTipoColloAdapter;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.adapter.DialogInputLUProdTipoColloListModel;
 
-public class InfoAggiuntiveLUDialog extends BaseDialogFragment implements InfoAggiuntiveLUDialogViewModel.Listener {
+public class DialogInfoAggiuntiveLU extends BaseDialogFragment implements InfoAggiuntiveLUDialogViewModel.Listener {
 
     @Inject
     InfoAggiuntiveLUDialogViewModel mViewModel;
@@ -48,15 +48,15 @@ public class InfoAggiuntiveLUDialog extends BaseDialogFragment implements InfoAg
     public ObservableField<String> selectedMtbTcol = new ObservableField<>();
     public ObservableField<DialogInputLUProdTipoColloListModel> currentMtbTCol = new ObservableField<>();
 
-    public static InfoAggiuntiveLUDialog newInstance(@NotNull RunnableArgss<String, MtbTCol> onComplete) {
-        return new InfoAggiuntiveLUDialog(null, onComplete);
+    public static DialogInfoAggiuntiveLU newInstance(@NotNull RunnableArgss<String, MtbTCol> onComplete) {
+        return new DialogInfoAggiuntiveLU(null, onComplete);
     }
 
-    public static InfoAggiuntiveLUDialog newInstance(MtbColt mtbColt, @NotNull RunnableArgss<String, MtbTCol> onComplete) {
-        return new InfoAggiuntiveLUDialog(mtbColt, onComplete);
+    public static DialogInfoAggiuntiveLU newInstance(MtbColt mtbColt, @NotNull RunnableArgss<String, MtbTCol> onComplete) {
+        return new DialogInfoAggiuntiveLU(mtbColt, onComplete);
     }
 
-    private InfoAggiuntiveLUDialog(MtbColt mtbColt, @NotNull RunnableArgss<String, MtbTCol> onComplete) {
+    private DialogInfoAggiuntiveLU(MtbColt mtbColt, @NotNull RunnableArgss<String, MtbTCol> onComplete) {
         super();
         this.mOnComplete = onComplete;
         this.currentMtbColt = mtbColt;
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/InfoAggiuntiveLUDialogComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/InfoAggiuntiveLUDialogComponent.java
index e5f7969c..276788a8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/InfoAggiuntiveLUDialogComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/InfoAggiuntiveLUDialogComponent.java
@@ -10,6 +10,6 @@ public interface InfoAggiuntiveLUDialogComponent {
         InfoAggiuntiveLUDialogComponent create();
     }
 
-    void inject(InfoAggiuntiveLUDialog infoAggiuntiveLUDialog);
+    void inject(DialogInfoAggiuntiveLU infoAggiuntiveLUDialog);
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUComponent.java
new file mode 100644
index 00000000..e294bfdb
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.input_peso_lu;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogInputPesoLUComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogInputPesoLUComponent create();
+    }
+
+    void inject(DialogInputPesoLUView dialogInputPesoLUView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUModule.java
new file mode 100644
index 00000000..097dc769
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.input_peso_lu;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogInputPesoLUComponent.class)
+public class DialogInputPesoLUModule {
+
+    @Provides
+    DialogInputPesoLUViewModel providesDialogInputPesoLUViewModel() {
+        return new DialogInputPesoLUViewModel();
+    }
+
+}
\ No newline at end of file
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
similarity index 67%
rename from app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLuView.java
rename to app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java
index a2db677a..2cc755d0 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
@@ -1,13 +1,13 @@
 package it.integry.integrywmsnative.view.dialogs.input_peso_lu;
 
 import android.app.Dialog;
+import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.widget.ArrayAdapter;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
 
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
@@ -16,8 +16,12 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.math.BigDecimal;
 import java.util.List;
 
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.di.BindableString;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
 import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
@@ -25,9 +29,17 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.databinding.DialogInputPesoLuBinding;
 
-public class DialogInputPesoLuView extends DialogFragment {
+public class DialogInputPesoLUView extends BaseDialogFragment {
+
+    @Inject
+    DialogInputPesoLUViewModel mViewModel;
+
+    @Inject
+    MagazzinoRESTConsumer magazzinoRESTConsumer;
 
     private DialogInputPesoLuBinding mBindings;
+    private Context mContext;
+
     private RunnableArgsss<String, BigDecimal, BigDecimal> onDialogDismiss;
 
     public BindableString codTcol = new BindableString();
@@ -39,7 +51,13 @@ public class DialogInputPesoLuView extends DialogFragment {
     private ArrayAdapter<String> codTcolArrayAdapter = null;
 
 
-    public DialogInputPesoLuView(String codTcol, BigDecimal netWeight, BigDecimal grossWeight, RunnableArgsss<String, BigDecimal, BigDecimal> onDialogDismiss) {
+    //Pass here all external parameters
+    public static DialogInputPesoLUView newInstance(String codTcol, BigDecimal netWeight, BigDecimal grossWeight, RunnableArgsss<String, BigDecimal, BigDecimal> onDialogDismiss) {
+        return new DialogInputPesoLUView(codTcol, netWeight, grossWeight, onDialogDismiss);
+    }
+
+    private DialogInputPesoLUView(String codTcol, BigDecimal netWeight, BigDecimal grossWeight, RunnableArgsss<String, BigDecimal, BigDecimal> onDialogDismiss) {
+        super();
         this.onDialogDismiss = onDialogDismiss;
 
         this.codTcol.set(codTcol);
@@ -47,44 +65,39 @@ public class DialogInputPesoLuView extends DialogFragment {
         this.grossWeight.set(UtilityNumber.decimalToString(grossWeight));
     }
 
+
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        mBindings = DialogInputPesoLuBinding.inflate(LayoutInflater.from(requireContext()), null, false);
+        this.mContext = requireContext();
+
+        mBindings = DialogInputPesoLuBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
         mBindings.setView(this);
 
+        MainApplication.appComponent
+                .dialogInputPesoLUComponent()
+                .create()
+                .inject(this);
+
         this.init();
 
-        var alertDialog =  new MaterialAlertDialogBuilder(requireContext())
+        var cancelable = false;
+
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
                 .setView(mBindings.getRoot())
-                .setCancelable(false)
-                .setPositiveButton(R.string.confirm, (dialog, which) -> {
-                    String newCodTcol = null;
-
-                    if(codTcol.get() != null) {
-                        Optional<MtbTCol> newCodTcolOptional = Stream.of(codTcolList)
-                                .filter(x -> (x.getCodTcol() + " - " + x.getDescrizione()).equalsIgnoreCase(codTcol.get()))
-                                .findSingle();
-
-                        if(newCodTcolOptional.isPresent()) newCodTcol = newCodTcolOptional.get().getCodTcol();
-                    }
-
-
-                    BigDecimal netWeightDecimal = new BigDecimal(netWeight.get());
-                    BigDecimal grossWeightDecimal = new BigDecimal(grossWeight.get());
-
-                    onDialogDismiss.run(newCodTcol, netWeightDecimal, grossWeightDecimal);
-                })
+                .setCancelable(cancelable)
                 .create();
-        alertDialog.setCanceledOnTouchOutside(false);
+
+        alertDialog.setCanceledOnTouchOutside(cancelable);
         return alertDialog;
     }
 
+
+
     private void init() {
 
-//        final DialogProgressView progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
-
-        MagazzinoRESTConsumer.getTipiColloStatic(codTcols -> {
+        magazzinoRESTConsumer.getTipiCollo(codTcols -> {
             this.codTcolList = codTcols;
 
             List<String> codTcolDescriptions = Stream.of(codTcols)
@@ -112,5 +125,4 @@ public class DialogInputPesoLuView extends DialogFragment {
 
     }
 
-
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUViewModel.java
new file mode 100644
index 00000000..3c6534c9
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUViewModel.java
@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.view.dialogs.input_peso_lu;
+
+public class DialogInputPesoLUViewModel {
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
index 3b396079..7d870f63 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
@@ -116,6 +116,11 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
     public DialogInputQuantityV2View() {
         super();
 //        openInFullScreen();
+
+        MainApplication.appComponent
+                .dialogInputQuantityV2Component()
+                .create()
+                .inject(this);
     }
 
     @Override
@@ -123,6 +128,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         super.onCreate(savedInstanceState);
         setStyle(DialogFragment.STYLE_NORMAL, R.style.AppTheme_NewMaterial_Dialog_FullscreenDialog);
         this.initBarcode();
+
     }
 
     @NonNull
@@ -142,11 +148,6 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         mBindings.setLifecycleOwner(this);
         mBindings.toolbar.setTitle("Inserimento articolo");
 
-        MainApplication.appComponent
-                .dialogInputQuantityV2Component()
-                .create()
-                .inject(this);
-
         this.mViewModel
                 .setMtbAart(mDialogInputQuantityV2DTO.getMtbAart())
                 .setInitialNumCnf(mDialogInputQuantityV2DTO.getInitialNumCnf())
@@ -186,7 +187,6 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
 
 
         if (mDialogInputQuantityV2DTO.isSaveOnImeDone()) {
-
             mBindings.inputNumCnfText.setOnEditorActionListener((v, actionId, event) -> {
                 if (actionId == EditorInfo.IME_ACTION_DONE) {
                     save();
@@ -195,7 +195,6 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                 return false;
             });
         }
-        this.onLoadingEnded();
 
         if (mDialogInputQuantityV2DTO.isFocusOnStart()) {
             getDialog().setOnShowListener(dialog -> {
@@ -236,7 +235,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         super.onDestroyView();
 
         BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
-        if (mAbort) this.mOnAbort.run();
+        if (mAbort && this.mOnAbort != null) this.mOnAbort.run();
     }
 
     private void initBarcode() {
@@ -465,7 +464,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         this.enabledNotes.set(this.mDialogInputQuantityV2DTO.isNotesAllowed());
         this.showProductLotStatus.set(SettingsManager.iDB().isNotifyLotStatus());
         this.enabledLUCloseButton.set(this.mDialogInputQuantityV2DTO.isCanLUBeClosed());
-        this.currentTaraArticolo.set(this.mViewModel.getMtbAart().getTaraKg());
+        this.currentTaraArticolo.set(this.mViewModel.getMtbAart().getTaraKg() != null ? this.mViewModel.getMtbAart().getTaraKg() : BigDecimal.ZERO);
 
         if (this.mDialogInputQuantityV2DTO.getMtbAart().isFlagQtaCnfFissaBoolean() && this.mDialogInputQuantityV2DTO.getTotalQtaOrd() != null && !this.mDialogInputQuantityV2DTO.getTotalQtaOrd().equals(BigDecimal.ZERO) && !(this.mDialogInputQuantityV2DTO.getQtaCnfOrd().compareTo(BigDecimal.ZERO) == 0)) {
             int numCnftoTake = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().divide(this.mDialogInputQuantityV2DTO.getQtaCnfOrd(), 0, RoundingMode.DOWN).intValue();
@@ -508,8 +507,10 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         this.currentQtaTot.set(this.mViewModel.getQtaTot());
 
         MtbAart articolo = this.mViewModel.getMtbAart();
+
         if (articolo != null && !articolo.isFlagQtaCnfFissaBoolean()) {
-            BigDecimal taraTot = this.mViewModel.getNumCnf().multiply(articolo.getTaraKg());
+            BigDecimal taraTot = articolo.getTaraKg() != null ? this.mViewModel.getNumCnf().multiply(articolo.getTaraKg()) : BigDecimal.ZERO;
+
             this.currentTaraTot.set(taraTot);
             this.currentPesoLordo.set(this.mViewModel.getQtaTot().add(taraTot));
             this.flagShowCnfToTakeLabel.set(false);
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java
index 40d63adc..62891bbe 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
@@ -23,7 +23,11 @@ public class DialogYesNoView extends DialogFragment {
     private final String description;
     private final RunnableArgs<DialogConsts.Results> onDialogDismiss;
 
-    public DialogYesNoView(final String title, final String description, RunnableArgs<DialogConsts.Results> onDialogDismiss) {
+    public static DialogYesNoView newInstance(final String title, final String description, RunnableArgs<DialogConsts.Results> onDialogDismiss) {
+        return new DialogYesNoView(title, description, onDialogDismiss);
+    }
+
+    private DialogYesNoView(final String title, final String description, RunnableArgs<DialogConsts.Results> onDialogDismiss) {
         super();
 
         this.title = title;
diff --git a/app/src/main/res/drawable/bottom_sheet_background.xml b/app/src/main/res/drawable/bottom_sheet_background.xml
new file mode 100644
index 00000000..ff847aa3
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_sheet_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <solid android:color="@android:color/white" />
+
+    <corners android:topLeftRadius="16dp"
+        android:topRightRadius="16dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/easter_egg__horror_blood.xml b/app/src/main/res/drawable/easter_egg__horror_blood.xml
new file mode 100644
index 00000000..adc323f1
--- /dev/null
+++ b/app/src/main/res/drawable/easter_egg__horror_blood.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="488.3dp"
+    android:height="168.7dp"
+    android:viewportWidth="488.3"
+    android:viewportHeight="168.7">
+  <path
+      android:pathData="M484.96,0c0.1,1.5 0.2,3.6 -0.3,6c-0.7,3.4 -2.1,5.8 -3.6,8.5c-0.9,1.7 -2,3.3 -3.5,5.2c-3.5,4.7 -7.2,17.7 -9.9,39.7s-1.3,59.4 1.5,72s-0.1,22.1 -4.6,26.3s0.9,2.1 -6.7,5.1c-7.6,3 -18.9,-5.4 -21.2,-17.7l0,0c-2.3,-12.3 -3.1,-9.1 -0.1,-21.5c3,-12.4 7.6,-24.9 7.7,-36.7c0.1,-11.8 -5.1,-34.2 -12.3,-38s-7,-2.7 -13.8,-3.1s-9.9,-0.1 -13.8,4.3c-3.9,4.4 -6.5,10.3 -7.9,19.7c-1.4,9.4 0,26.7 2.4,33.1c2.4,6.4 3.7,6.8 1,14.9c-2.7,8.1 -15.7,9.9 -20.5,2.9c-4.8,-7.1 -4.3,-17.9 -1.5,-34.7c2.8,-16.8 2.3,-14.6 2.2,-27.2c0,-12.6 1,-11.4 -1.3,-15.8c-2.3,-4.4 -9.7,-9.7 -16.9,-5.7c-7.2,4 -11.7,21.3 -12.6,28.1s-0.9,24.5 0.4,31c1.2,6.5 1.3,12.8 -0.6,17.5s-4,7.4 -7.2,8.6s-6.4,1.4 -10.1,-0.9c-3.7,-2.3 -8.2,-4.8 -8.7,-16.8c-0.5,-12 3.7,-39.8 2.1,-53.6c-1.2,-10.7 -3.7,-14.3 -9.2,-10.6c-3.9,2.6 -7.2,9.4 -4.9,16s2.8,8.4 2.7,13s-1.1,8 -4.4,11.6c-3.3,3.5 -8.3,5 -12.8,1.9c-4.5,-3.1 -6.7,-9.9 -4.3,-18.3c2.5,-8.4 10.1,-11.6 1.7,-19.2c-8.3,-7.6 -14.9,1.7 -15.1,15.6c-0.2,14 0.8,23 3.6,32.5c2.8,9.6 4.1,14.7 4.1,22.7s-5.1,16.1 -12.8,15.3s-12.7,-15.8 -14.7,-26.2c-2,-10.4 -1.8,-8.8 -2.5,-11.3s-1.3,-5 -1.6,-9.6c-1.8,-13 4.7,-26 4.8,-37.1c0,-6.6 0.8,-8.5 -2.8,-12.3s-19.3,6.1 -23.4,17.1s-3.9,10.9 -3.6,25.9s1.8,25.1 5.1,34.5c3.3,9.4 3.9,16.5 3.2,19.7c-0.6,3.3 -0.6,3.1 -1.3,8.3c-0.7,5.2 -3.9,10.8 -6.8,12.3c-3.9,2 -8.2,0.3 -10.5,-1.8c-2.4,-2.4 -5.4,-8.4 -6.7,-13.9s-1.3,-8.5 -1.3,-16s0.3,-14.8 0.7,-19.7c0.4,-4.9 0.8,-11.8 1.1,-25.1c0.3,-13.3 -0.4,-19.2 -3.6,-29.8s-3.5,-9.7 -7.1,-13.5s-5.6,-4.9 -8.6,-4.9c-2.9,0 -8.5,3 -11.3,5.9c-2.7,2.9 -5.6,8.2 -8,15.5s-2.7,9.4 0.3,22.8s3.5,16.2 1.4,27.5c-2,11.3 -7.2,16.8 -14.8,16.8s-12.2,-3.3 -14.5,-7.8s-3.7,-12.1 -3.4,-17.3s2,-15.6 2.8,-18.3c0.9,-2.6 2.8,-14.6 3.3,-20.7c0.5,-6.1 -0.4,-11 -3.4,-16.2s-4.6,-7.1 -6.5,-8.3c-4.8,-2.5 -9.5,2.4 -11.6,4.6c-3.8,3.9 -7.6,10.3 -9,14.7s-1,4.3 -0.3,12s0.8,8.5 -0.2,17s-1.6,11.8 -4.2,15.3s-4,4.7 -9.7,4.7s-12.5,-6.7 -13.7,-12.5s1.4,-15.6 3.1,-23.4s1,-20.1 -0.3,-24c-4,-13.1 -11.8,-9.2 -16.1,-1.2c-5.2,7.4 -5.5,31.2 -3.5,39.9s0.6,19.8 -0.4,24.8s-4.2,12.3 -7,15.4s-10.6,4.7 -14.7,2.4s-8.1,-6.9 -9.7,-11.6c-1.6,-4.7 -1.4,-13.4 0.3,-17.2c1.7,-3.8 7.6,-11.5 8.4,-23.2c0.9,-11.7 -4.8,-17 -5.4,-18.6c-0.6,-1.6 -2.5,-1.1 -4.5,1c-7.6,9.1 -5.7,19.2 -5.8,24.7c-0.4,14.7 3.9,39.6 4.1,49.4c0.2,9.8 -1.7,12.8 -3.5,17.6c-1.8,4.8 -3.4,7.4 -7.6,10s-10.2,5.3 -14.5,3.4c-4.3,-2 -5.1,0.1 -9.1,-11.3c-4,-11.4 1.5,-34 4.2,-42.1c2.7,-8.1 4.2,-11 5.3,-18.4s2.4,-20.6 2.4,-38c0,-17.3 0.6,-16.8 -1.5,-21.5c-3.1,-6.7 -5.1,-14.5 -1.9,-20.4c0.2,-0.4 0.6,-1.1 1.2,-1.8C171.66,0 328.26,0 484.96,0z"
+      android:fillColor="#D32F2F"/>
+</vector>
diff --git a/app/src/main/res/drawable/gray_detail_background_round4.xml b/app/src/main/res/drawable/gray_detail_background_round4.xml
index 885d9a58..17ce17f0 100644
--- a/app/src/main/res/drawable/gray_detail_background_round4.xml
+++ b/app/src/main/res/drawable/gray_detail_background_round4.xml
@@ -4,8 +4,8 @@
     <solid android:color="#ebebeb" />
 
     <padding
-        android:left="1dp"
-        android:right="1dp"
+        android:left="2dp"
+        android:right="2dp"
         android:top="1dp" />
 
     <corners android:radius="4dp" />
diff --git a/app/src/main/res/drawable/ic_black_upload.xml b/app/src/main/res/drawable/ic_black_upload.xml
index 6edadf8e..b4ec3e7e 100644
--- a/app/src/main/res/drawable/ic_black_upload.xml
+++ b/app/src/main/res/drawable/ic_black_upload.xml
@@ -1,4 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,2A1,1 0,0 0,11.293 2.2949L6.1602,7.1348A0.5,0.5 0,0 0,6.1484 7.1445L6.1465,7.1465A0.5,0.5 0,0 0,6 7.5A0.5,0.5 0,0 0,6.5 8L10,8L10,16C10,16.552 10.448,17 11,17L12,17L13,17C13.552,17 14,16.552 14,16L14,8L17.5,8A0.5,0.5 0,0 0,18 7.5A0.5,0.5 0,0 0,17.8535 7.1465L17.8223,7.1172L12.7168,2.3027A1,1 0,0 0,12.6836 2.2715A1,1 0,0 0,12 2zM3,20A1.0001,1.0001 0,1 0,3 22L21,22A1.0001,1.0001 0,1 0,21 20L3,20z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_inventario_header_outline.png b/app/src/main/res/drawable/ic_inventario_header_outline.png
new file mode 100644
index 00000000..fb2e1527
Binary files /dev/null and b/app/src/main/res/drawable/ic_inventario_header_outline.png differ
diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
index 5452db46..73d8344b 100644
--- a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
@@ -721,7 +721,7 @@
                             android:visibility="@{viewmodel.canPartitaMagBeChanged() || viewmodel.partitaMag != null ? View.VISIBLE : View.GONE}"
                             tools:layout_weight="1">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_partita_mag_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -742,7 +742,7 @@
                             android:enabled="@{view.enabledChangePartitaMag}"
                             android:visibility="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? View.VISIBLE : View.GONE}">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_data_scad_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -777,7 +777,7 @@
                             android:paddingEnd="4dp"
                             tools:layout_weight="1">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_num_cnf_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -800,7 +800,7 @@
                             android:paddingEnd="4dp"
                             android:visibility="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? View.VISIBLE : View.GONE}">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_qta_cnf_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -823,7 +823,7 @@
                             android:imeOptions="actionDone"
                             tools:layout_weight="1">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_qta_tot_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -857,7 +857,7 @@
                             android:paddingEnd="4dp"
                             tools:layout_weight="1">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_tara_ped_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -880,7 +880,7 @@
                             android:focusableInTouchMode="false"
                             android:paddingEnd="4dp">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_tara_col_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -905,7 +905,7 @@
                             android:imeOptions="actionDone"
                             tools:layout_weight="1">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_peso_lordo_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -935,7 +935,7 @@
                             android:enabled="@{view.enabledNotes}"
                             android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_note_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -952,19 +952,19 @@
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="16dp"
+                        android:layout_marginTop="16dp"
                         android:gravity="center_horizontal"
                         android:orientation="horizontal"
-                        android:weightSum="1">
+                        android:weightSum="3">
 
-                        <com.google.android.material.button.MaterialButton
+                        <Button
                             android:id="@+id/close_lu_btn"
                             style="@style/Button.PrimaryOutline"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="0dp"
                             android:layout_marginEnd="4dp"
-                            android:layout_weight="0.4"
+                            android:layout_weight="1"
                             android:onClick="@{() -> view.saveAndCloseLU()}"
                             android:text="@string/action_close_ul"
                             app:layout_constraintStart_toStartOf="parent"
@@ -973,14 +973,14 @@
                             app:visibility="@{view.enabledLUCloseButton}" />
 
 
-                        <com.google.android.material.button.MaterialButton
+                        <Button
                             android:id="@+id/abort_btn"
                             style="@style/Button.DangerFull"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="4dp"
                             android:layout_marginEnd="4dp"
-                            android:layout_weight="0.3"
+                            android:layout_weight="1"
                             android:onClick="@{() -> view.dismiss()}"
                             android:paddingEnd="3dp"
                             app:icon="@drawable/ic_close_24dp"
@@ -988,16 +988,15 @@
                             app:layout_constraintTop_toTopOf="parent" />
 
 
-                        <com.google.android.material.button.MaterialButton
+                        <Button
                             android:id="@+id/save_btn"
                             style="@style/Button.PrimaryFull"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="4dp"
                             android:layout_marginEnd="0dp"
-                            android:layout_weight="0.3"
+                            android:layout_weight="1"
                             android:onClick="@{() -> view.save()}"
-                            android:paddingEnd="3dp"
                             app:icon="@drawable/ic_save_24"
                             app:iconGravity="textStart"
                             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml b/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml
index 1444c7e1..4bafa159 100644
--- a/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml
+++ b/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml
@@ -202,7 +202,8 @@
             app:behavior_hideable="false"
             app:behavior_peekHeight="66dp"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-            app:visibility="@{accettazioneView.bottomSheetEnabled}" />
+            app:visibility="@{accettazioneView.bottomSheetEnabled}"
+            app:parentView="@id/bottom_sheet_lu_content"/>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
index de1e7a22..b8c1d53a 100644
--- a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
+++ b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
@@ -47,7 +47,7 @@
                     <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolbar"
                         android:layout_width="match_parent"
-                        android:layout_height="?actionBarSize">
+                        android:layout_height="?attr/actionBarSize">
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/toolbar_title"
                             android:layout_width="wrap_content"
@@ -363,6 +363,8 @@
             android:layout_height="wrap_content"
             app:behavior_hideable="true"
             app:behavior_peekHeight="0dp"
-            app:layout_behavior=".view.bottom_sheet__base.AutoCloseBottomSheetBehavior" />
+            app:layout_behavior=".view.bottom_sheet__base.AutoCloseBottomSheetBehavior"
+            app:parentView="@id/bottom_sheet__mtb_colr_edit"
+            app:backgroundView="@id/bottom_sheet__mtb_colr_edit__background"/>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_contenuto_bancale.xml b/app/src/main/res/layout/activity_contenuto_bancale.xml
index e6c2bf2c..34b600f4 100644
--- a/app/src/main/res/layout/activity_contenuto_bancale.xml
+++ b/app/src/main/res/layout/activity_contenuto_bancale.xml
@@ -38,7 +38,7 @@
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="?actionBarSize"
+                    android:layout_height="?attr/actionBarSize"
                     app:popupTheme="@style/AppTheme.PopupOverlay"
                     tools:title="Contenuto bancale" />
 
diff --git a/app/src/main/res/layout/activity_lista_bancali.xml b/app/src/main/res/layout/activity_lista_bancali.xml
index 511e76ab..8d7a59b1 100644
--- a/app/src/main/res/layout/activity_lista_bancali.xml
+++ b/app/src/main/res/layout/activity_lista_bancali.xml
@@ -20,7 +20,7 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?actionBarSize"/>
+                android:layout_height="?attr/actionBarSize"/>
 
         </it.integry.integrywmsnative.ui.ElevatedToolbar>
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9b2b5087..693d9d75 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/full_white"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="false"
         tools:openDrawer="start">
 
         <include
@@ -25,6 +25,16 @@
             android:background="@android:color/white"
             app:headerLayout="@layout/nav_header_main" />
 
+        <View
+            android:id="@+id/bottom_sheet__background"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#99000000"
+            android:visibility="gone"
+            android:clickable="true"
+            android:focusable="true"
+            android:fitsSystemWindows="true"/>
+
     </androidx.drawerlayout.widget.DrawerLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/activity_picking_inventario.xml b/app/src/main/res/layout/activity_picking_inventario.xml
new file mode 100644
index 00000000..3ded5a0e
--- /dev/null
+++ b/app/src/main/res/layout/activity_picking_inventario.xml
@@ -0,0 +1,235 @@
+<?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.inventario.picking.PickingInventarioActivity" />
+
+        <variable
+            name="viewmodel"
+            type="it.integry.integrywmsnative.gest.inventario.picking.PickingInventarioViewModel" />
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/header_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+
+<!--            <it.integry.integrywmsnative.ui.ElevatedToolbar-->
+<!--                android:id="@+id/elevated_toolbar"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content">-->
+
+<!--                <androidx.appcompat.widget.Toolbar-->
+<!--                    android:id="@+id/toolbar"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="?attr/actionBarSize">-->
+
+<!--                    <androidx.appcompat.widget.AppCompatImageButton-->
+<!--                        android:id="@+id/reset_values"-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="50dp"-->
+<!--                        android:layout_gravity="end"-->
+<!--                        android:adjustViewBounds="true"-->
+<!--                        android:scaleType="fitCenter"-->
+<!--                        android:src="@drawable/ic_black_upload"-->
+<!--                        android:backgroundTint="@android:color/transparent"-->
+<!--                        android:onClick="@{() -> view.requestExportConfirm()}"-->
+<!--                        android:tint="?attr/colorControlNormal" />-->
+
+<!--                </androidx.appcompat.widget.Toolbar>-->
+
+<!--            </it.integry.integrywmsnative.ui.ElevatedToolbar>-->
+
+            <com.google.android.material.appbar.AppBarLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:liftOnScroll="true"
+                app:liftOnScrollTargetViewId="@id/scroll_view">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    app:menu="@menu/picking_inventario_menu"
+                    app:title="@string/activity_picking_inventario_title"
+                    app:navigationIcon="@drawable/ic_close_24dp"
+                    app:navigationIconTint="@android:color/black"/>
+
+            </com.google.android.material.appbar.AppBarLayout>
+
+
+            <androidx.core.widget.NestedScrollView
+                android:id="@+id/scroll_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <androidx.cardview.widget.CardView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="12dp"
+                        app:cardCornerRadius="16dp"
+                        app:cardElevation="4dp">
+
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:id="@+id/profile_root_container"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@color/colorPrimary"
+                            android:orientation="horizontal"
+                            android:padding="16dp">
+
+
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:layout_width="30dp"
+                                android:layout_height="30dp"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginEnd="16dp"
+                                android:adjustViewBounds="true"
+                                android:src="@drawable/ic_inventario_header_outline"
+                                android:tint="@android:color/white" />
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical">
+
+                                <RelativeLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_alignParentStart="true"
+                                        android:layout_marginTop="2dp"
+                                        android:layout_toStartOf="@id/loaded_arts_info_layout"
+                                        android:orientation="horizontal">
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="ID:"
+                                            android:textColor="@android:color/white" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
+                                            android:layout_width="match_parent"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginStart="4dp"
+                                            android:text="@{viewmodel.currentInventario.idInventario.toString()}"
+                                            android:textColor="@android:color/white"
+                                            tools:text="670" />
+
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                                    <androidx.appcompat.widget.LinearLayoutCompat
+                                        android:id="@+id/loaded_arts_info_layout"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_alignParentEnd="true"
+                                        android:orientation="horizontal">
+
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@{String.valueOf(viewmodel.availableArts.size())}"
+                                            tools:text="10250" />
+
+                                        <androidx.appcompat.widget.AppCompatTextView
+                                            style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginStart="4dp"
+                                            android:text="articoli" />
+
+                                        <androidx.appcompat.widget.AppCompatImageView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginStart="4dp"
+                                            android:adjustViewBounds="true"
+                                            android:src="@drawable/ic_black_barcode_scanner"
+                                            android:tint="@color/white" />
+
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                                </RelativeLayout>
+
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="2dp"
+                                    android:orientation="horizontal">
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="Zona:" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="4dp"
+                                        android:text="Non definita"
+                                        android:textStyle="italic"
+                                        app:visibility="@{viewmodel.currentInventario.zona == null}" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="4dp"
+                                        android:text="@{viewmodel.currentInventario.zona}"
+                                        app:visibility="@{viewmodel.currentInventario.zona != null}" />
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                    </androidx.cardview.widget.CardView>
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/picking_inventario_main_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:nestedScrollingEnabled="false"
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                        tools:listitem="@layout/activity_picking_inventario__list_item" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </androidx.core.widget.NestedScrollView>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_picking_inventario__list_item.xml b/app/src/main/res/layout/activity_picking_inventario__list_item.xml
new file mode 100644
index 00000000..07248401
--- /dev/null
+++ b/app/src/main/res/layout/activity_picking_inventario__list_item.xml
@@ -0,0 +1,122 @@
+<?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.InventarioRowRoomDTO" />
+    </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:padding="8dp"
+        android:background="?attr/selectableItemBackground">
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/linearLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintEnd_toStartOf="@+id/qta_box"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginEnd="8dp">
+
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/cod_mart"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{item.codMart}"
+                    android:textStyle="bold"
+                    tools:text="COD MART" />
+
+
+<!--                <androidx.appcompat.widget.AppCompatTextView-->
+<!--                    style="@style/AppTheme.NewMaterial.Text.Small"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_alignParentEnd="true"-->
+<!--                    android:background="@drawable/badge_round_corner"-->
+<!--                    android:backgroundTint="@color/orange_600"-->
+<!--                    android:paddingStart="6dp"-->
+<!--                    android:paddingEnd="6dp"-->
+<!--                    android:text="@{UtilityNumber.decimalToString(item.qtaInv) + item.mtbAart.untMis}"-->
+<!--                    android:textColor="@android:color/white"-->
+<!--                    android:textSize="14sp"-->
+<!--                    android:textStyle="bold"-->
+<!--                    android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"-->
+<!--                    tools:text="PESO KG" />-->
+
+            </RelativeLayout>
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AppTheme.NewMaterial.Text.Medium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:text="@{item.descrizione}"
+                tools:text="Descrizione lunga articolo" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AppTheme.NewMaterial.Text.Small"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{`Lotto: ` + item.getPartitaMag()}"
+                android:enabled="false"
+                android:visibility="@{UtilityString.isNullOrEmpty(item.getPartitaMag()) ? View.GONE : View.VISIBLE}"
+                tools:text="Lotto: ABCDE" />
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+        <RelativeLayout
+            android:id="@+id/qta_box"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/qta_textview"
+                style="@style/AppTheme.NewMaterial.Text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/badge_round_corner"
+                android:backgroundTint="@color/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"
+                android:text="@{UtilityNumber.decimalToString(item.qta) + `\n` + item.untMis}"
+                tools:text="280.45\nCONF" />
+
+        </RelativeLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_picking_resi.xml b/app/src/main/res/layout/activity_picking_resi.xml
index bb0ac519..a3114789 100644
--- a/app/src/main/res/layout/activity_picking_resi.xml
+++ b/app/src/main/res/layout/activity_picking_resi.xml
@@ -45,10 +45,9 @@
                         <androidx.appcompat.widget.Toolbar
                             android:id="@+id/toolbar"
                             android:layout_width="match_parent"
-                            android:layout_height="?actionBarSize"
+                            android:layout_height="?attr/actionBarSize"
                             android:gravity="center_horizontal"
-                            app:layout_collapseMode="pin"
-                            style="@style/MaterialToolbar.Event">
+                            app:layout_collapseMode="pin">
 
                     </androidx.appcompat.widget.Toolbar>
 
@@ -260,7 +259,8 @@
             app:visibility="@{pickingResiView.bottomSheetEnabled}"
             app:behavior_hideable="false"
             app:behavior_peekHeight="66dp"
-            app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />
+            app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
+            app:parentView="@id/bottom_sheet_lu_content"/>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml
index 7fe0fe54..5d1fd624 100644
--- a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml
+++ b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml
@@ -27,7 +27,7 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/gray_detail_background_round8">
+        android:background="#ebebeb">
 
 
         <androidx.appcompat.widget.LinearLayoutCompat
@@ -45,7 +45,7 @@
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="?actionBarSize">
+                    android:layout_height="?attr/actionBarSize">
 
 
                 </androidx.appcompat.widget.Toolbar>
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 26a62561..5d24dddb 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
@@ -37,7 +37,7 @@
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="?actionBarSize">
+                    android:layout_height="?attr/actionBarSize">
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/toolbar_title"
diff --git a/app/src/main/res/layout/activity_spedizione.xml b/app/src/main/res/layout/activity_spedizione.xml
index bfd765b7..5dc66593 100644
--- a/app/src/main/res/layout/activity_spedizione.xml
+++ b/app/src/main/res/layout/activity_spedizione.xml
@@ -301,7 +301,8 @@
             app:visibility="@{spedizioneView.bottomSheetEnabled}"
             app:behavior_hideable="false"
             app:behavior_peekHeight="66dp"
-            app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />
+            app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
+            app:parentView="@id/bottom_sheet_lu_content" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index b361628d..ea9e8c9b 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -21,7 +21,7 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?actionBarSize"
+                android:layout_height="?attr/actionBarSize"
                 android:gravity="center_horizontal"
                 app:popupTheme="@style/AppTheme.PopupOverlay">
 
diff --git a/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml b/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml
new file mode 100644
index 00000000..4d3b4f88
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+
+        <import type="android.view.View" />
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_actions.BottomSheetInventarioActionsView" />
+
+        <variable
+            name="viewModel"
+            type="it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_actions.BottomSheetInventarioActionsViewModel" />
+
+    </data>
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="16dp"
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toStartOf="@id/qta_layout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="2"
+                        android:paddingStart="0dp"
+                        android:paddingEnd="4dp"
+                        android:text="Inventario num."
+                        android:textColor="#444"
+                        android:textStyle="bold" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="2"
+                        android:text="@{viewModel.currentItem.idInventario.toString()}"
+                        android:textColor="#444"
+                        android:textStyle="bold"
+                        tools:text="500" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="@{UtilityString.isNullOrEmpty(viewModel.currentItem.zona) ? View.GONE : View.VISIBLE}">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Zona: " />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{viewModel.currentItem.zona}"
+                        android:textStyle="italic"
+                        tools:text="Surgelati" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:enabled="false"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Nessuna zona definita"
+                    android:visibility="@{!UtilityString.isNullOrEmpty(viewModel.currentItem.zona) ? View.GONE : View.VISIBLE}" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal"
+            android:weightSum="1">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:enabled="false"
+                android:focusable="true"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp"
+                app:singleClick="@{() -> view.editItem()}"
+                app:visibility="@{view.enabledEditButton}">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/bottom_sheet_actions_edit_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:duplicateParentState="true"
+                    android:padding="16dp"
+                    android:scaleX="1.5"
+                    android:scaleY="1.5"
+                    android:src="@drawable/ic_edit_24dp"
+                    android:tint="@color/green_600" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:duplicateParentState="true"
+                    android:text="@string/edit" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp"
+                app:singleClick="@{() -> view.deleteItem()}"
+                app:visibility="@{view.enabledDeleteButton ? View.VISIBLE : View.GONE}">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/bottom_sheet_actions_delete_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp"
+                    android:scaleX="1.5"
+                    android:scaleY="1.5"
+                    android:src="@drawable/ic_delete_24dp"
+                    android:tint="@color/red_600" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/delete" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml b/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml
new file mode 100644
index 00000000..0b7ed174
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+
+        <import type="android.view.View" />
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_actions.BottomSheetInventarioRowActionsView" />
+
+        <variable
+            name="viewModel"
+            type="it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_actions.BottomSheetInventarioRowActionsViewModel" />
+
+    </data>
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="16dp"
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toStartOf="@id/qta_layout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.currentItem.codMart}"
+                    android:textStyle="bold"
+                    tools:text="COD ART" />
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="2"
+                    android:text="@{viewModel.currentItem.descrizione}"
+                    android:textStyle="bold"
+                    tools:text="Parmareggio DOP 24 carati" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/qta_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="end"
+                        android:text="@{UtilityNumber.decimalToString(viewModel.currentItem.qta)}"
+                        android:textStyle="bold"
+                        tools:text="250" />
+
+                    <TextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:gravity="end"
+                        android:text="@{viewModel.currentItem.untMis}"
+                        android:textStyle="bold"
+                        tools:text="PZ" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="end"
+                        android:text="@{UtilityNumber.decimalToString(viewModel.currentItem.numConf)}"
+                        android:textStyle="bold"
+                        tools:text="25" />
+
+                    <TextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:gravity="end"
+                        android:text="@string/unt_mis_col"
+                        android:textAllCaps="true"
+                        android:textStyle="bold" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal"
+            android:weightSum="1">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:enabled="false"
+                android:focusable="true"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp"
+                app:singleClick="@{() -> view.editItem()}"
+                app:visibility="@{view.enabledEditButton}">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/bottom_sheet_actions_edit_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:duplicateParentState="true"
+                    android:padding="16dp"
+                    android:scaleX="1.5"
+                    android:scaleY="1.5"
+                    android:src="@drawable/ic_edit_24dp"
+                    android:tint="@color/green_600" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:duplicateParentState="true"
+                    android:text="@string/edit" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp"
+                app:singleClick="@{() -> view.deleteItem()}"
+                app:visibility="@{view.enabledDeleteButton ? View.VISIBLE : View.GONE}">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/bottom_sheet_actions_delete_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp"
+                    android:scaleX="1.5"
+                    android:scaleY="1.5"
+                    android:src="@drawable/ic_delete_24dp"
+                    android:tint="@color/red_600" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/delete" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</layout>
\ No newline at end of file
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
new file mode 100644
index 00000000..96e92a60
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet__item_edit_view.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+        <import type="android.view.View" />
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.view.bottom_sheet__item_edit.BottomSheetItemEditView" />
+
+        <variable
+            name="viewModel"
+            type="it.integry.integrywmsnative.view.bottom_sheet__item_edit.BottomSheetItemEditViewModel" />
+    </data>
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bottom_sheet_background"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toStartOf="@id/qta_layout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/bottom_sheet_actions_title"
+                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="2"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="8dp"
+                    android:text="@{viewModel.currentItem.descrizioneArticolo}"
+                    android:textColor="#444"
+                    android:textStyle="bold"
+                    tools:text="Descrizione articolo" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/bottom_sheet_actions_subtitle"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.currentItem.codMart}"
+                    tools:text="ABF52IL" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/qta_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="end"
+                        android:text="@{UtilityNumber.decimalToString(viewModel.currentItem.qta)}"
+                        android:textStyle="bold"
+                        tools:text="250" />
+
+                    <TextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:gravity="end"
+                        android:text="@{viewModel.currentItem.untMis}"
+                        android:textStyle="bold"
+                        tools:text="PZ" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="end"
+                        android:text="@{UtilityNumber.decimalToString(viewModel.currentItem.numCnf)}"
+                        android:textStyle="bold"
+                        tools:text="250" />
+
+                    <TextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:gravity="end"
+                        android:text="@string/unt_mis_col"
+                        android:textAllCaps="true"
+                        android:textStyle="bold" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal"
+            android:weightSum="1">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:clickable="true"
+                android:enabled="false"
+                android:focusable="true"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:background="?attr/selectableItemBackground"
+                app:layout_constraintEnd_toStartOf="@id/guideline_action"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:singleClick="@{() -> view.editItem()}"
+                app:visibility="@{view.enabledEditButton}">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/bottom_sheet_actions_edit_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:duplicateParentState="true"
+                    android:padding="16dp"
+                    android:scaleX="1.5"
+                    android:scaleY="1.5"
+                    android:src="@drawable/ic_edit_24dp"
+                    android:tint="@color/green_600" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:duplicateParentState="true"
+                    android:text="@string/edit" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:background="?attr/selectableItemBackground"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="@id/guideline_action"
+                app:layout_constraintTop_toTopOf="parent"
+                app:singleClick="@{() -> view.deleteItem()}"
+                app:visibility="@{view.enabledDeleteButton ? View.VISIBLE : View.GONE}">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/bottom_sheet_actions_delete_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp"
+                    android:scaleX="1.5"
+                    android:scaleY="1.5"
+                    android:src="@drawable/ic_delete_24dp"
+                    android:tint="@color/red_600" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/delete" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml b/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml
index af488e79..ffb0b93e 100644
--- a/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml
+++ b/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml
@@ -7,6 +7,7 @@
     <data>
 
         <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+
         <import type="android.view.View" />
 
         <variable
@@ -18,221 +19,200 @@
             type="it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditViewModel" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:background="@drawable/bottom_sheet_background"
+        android:orientation="vertical"
+        android:padding="16dp">
 
 
-        <androidx.cardview.widget.CardView
-            android:layout_width="0dp"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardCornerRadius="16dp"
-            app:cardElevation="4dp"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_margin="16dp">
+                android:layout_marginBottom="8dp"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toStartOf="@id/qta_layout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/title_layout"
-                    android:layout_width="0dp"
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/bottom_sheet_actions_title"
+                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
+                    android:ellipsize="end"
+                    android:maxLines="2"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="8dp"
+                    android:text="@{viewModel.mtbColr.descrizione}"
+                    android:textColor="#444"
+                    android:textStyle="bold"
+                    tools:text="Descrizione articolo" />
 
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
-                        android:orientation="vertical"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/qta_layout">
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/bottom_sheet_actions_subtitle"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.mtbColr.codMart}"
+                    tools:text="ABF52IL" />
 
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/bottom_sheet_actions_title"
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:ellipsize="end"
-                            android:maxLines="2"
-                            android:paddingStart="0dp"
-                            android:paddingEnd="8dp"
-                            android:text="@{viewModel.mtbColr.descrizione}"
-                            android:textColor="#444"
-                            android:textStyle="bold"
-                            tools:text="Descrizione articolo" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/bottom_sheet_actions_subtitle"
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{viewModel.mtbColr.codMart}"
-                            tools:text="ABF52IL" />
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/qta_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
-                    </LinearLayout>
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:id="@+id/qta_layout"
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
+                        android:gravity="end"
+                        android:text="@{UtilityNumber.decimalToString(viewModel.mtbColr.qtaCol)}"
+                        android:textStyle="bold"
+                        tools:text="250" />
 
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="end"
-                                android:text="@{UtilityNumber.decimalToString(viewModel.mtbColr.qtaCol)}"
-                                android:textStyle="bold"
-                                tools:text="250" />
-
-                            <TextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="4dp"
-                                android:gravity="end"
-                                android:text="@{viewModel.mtbColr.untMis}"
-                                android:textStyle="bold"
-                                tools:text="PZ" />
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="end"
-                                android:text="@{UtilityNumber.decimalToString(viewModel.mtbColr.numCnf)}"
-                                android:textStyle="bold"
-                                tools:text="250" />
-
-                            <TextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="4dp"
-                                android:gravity="end"
-                                android:text="@string/unt_mis_col"
-                                android:textAllCaps="true"
-                                android:textStyle="bold" />
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/title_layout">
-
-
-                    <androidx.constraintlayout.widget.Guideline
-                        android:id="@+id/guideline_action"
+                    <TextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintGuide_percent="@{!view.enabledEditButton ? 0f : (!view.enabledDeleteButton ? 1f : 0.50f)}"
-                        tools:layout_constraintGuide_percent="0.5f"/>
+                        android:layout_marginStart="4dp"
+                        android:gravity="end"
+                        android:text="@{viewModel.mtbColr.untMis}"
+                        android:textStyle="bold"
+                        tools:text="PZ" />
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:layout_width="0dp"
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:enabled="false"
-                        app:visibility="@{view.enabledEditButton}"
-                        app:singleClick="@{() -> view.editMtbColr()}"
-                        app:layout_constraintEnd_toStartOf="@id/guideline_action"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
+                        android:gravity="end"
+                        android:text="@{UtilityNumber.decimalToString(viewModel.mtbColr.numCnf)}"
+                        android:textStyle="bold"
+                        tools:text="250" />
 
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/bottom_sheet_actions_edit_btn"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@android:color/white"
-                            android:padding="16dp"
-                            android:scaleX="1.5"
-                            android:scaleY="1.5"
-                            android:src="@drawable/ic_edit_24dp"
-                            android:tint="@color/green_600"
-                            android:duplicateParentState="true"/>
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/edit"
-                            android:duplicateParentState="true" />
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:layout_width="0dp"
+                    <TextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:clickable="true"
-                        android:focusable="true"
-                        app:visibility="@{view.enabledDeleteButton ? View.VISIBLE : View.GONE}"
-                        app:singleClick="@{() -> view.deleteMtbColr()}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="@id/guideline_action"
-                        app:layout_constraintTop_toTopOf="parent">
+                        android:layout_marginStart="4dp"
+                        android:gravity="end"
+                        android:text="@string/unt_mis_col"
+                        android:textAllCaps="true"
+                        android:textStyle="bold" />
 
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/bottom_sheet_actions_delete_btn"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@android:color/white"
-                            android:padding="16dp"
-                            android:scaleX="1.5"
-                            android:scaleY="1.5"
-                            android:src="@drawable/ic_delete_24dp"
-                            android:tint="@color/red_600" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/delete" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    </androidx.appcompat.widget.LinearLayoutCompat>
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal"
+            android:weightSum="1">
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:clickable="true"
+                android:enabled="false"
+                android:focusable="true"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:background="?attr/selectableItemBackground"
+                app:layout_constraintEnd_toStartOf="@id/guideline_action"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:singleClick="@{() -> view.editMtbColr()}"
+                app:visibility="@{view.enabledEditButton}">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/bottom_sheet_actions_edit_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:duplicateParentState="true"
+                    android:padding="16dp"
+                    android:scaleX="1.5"
+                    android:scaleY="1.5"
+                    android:src="@drawable/ic_edit_24dp"
+                    android:tint="@color/green_600" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:duplicateParentState="true"
+                    android:text="@string/edit" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:background="?attr/selectableItemBackground"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="@id/guideline_action"
+                app:layout_constraintTop_toTopOf="parent"
+                app:singleClick="@{() -> view.deleteMtbColr()}"
+                app:visibility="@{view.enabledDeleteButton ? View.VISIBLE : View.GONE}">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/bottom_sheet_actions_delete_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp"
+                    android:scaleX="1.5"
+                    android:scaleY="1.5"
+                    android:src="@drawable/ic_delete_24dp"
+                    android:tint="@color/red_600" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/delete" />
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
-        </androidx.cardview.widget.CardView>
-    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
index 3b26ec5e..0819763c 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
@@ -544,6 +544,8 @@
             android:layout_height="wrap_content"
             app:behavior_hideable="true"
             app:behavior_peekHeight="0dp"
-            app:layout_behavior=".view.bottom_sheet__base.AutoCloseBottomSheetBehavior" />
+            app:layout_behavior=".view.bottom_sheet__base.AutoCloseBottomSheetBehavior"
+            app:parentView="@id/bottom_sheet__mtb_colr_edit"
+            app:backgroundView="@id/bottom_sheet__mtb_colr_edit__background" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ask_info_inventario.xml b/app/src/main/res/layout/dialog_ask_info_inventario.xml
new file mode 100644
index 00000000..cee7a82c
--- /dev/null
+++ b/app/src/main/res/layout/dialog_ask_info_inventario.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.gest.inventario.dialogs.ask_info_inventario.DialogAskInfoInventarioView" />
+    </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="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="Info inventario" />
+
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/input_inventory_id"
+                style="@style/TextInputLayout.OutlinePrimary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/inventory_id"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/description_text">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/input_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:binding="@{view.inventoryId}"
+                    android:inputType="number"/>
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/input_zone"
+                style="@style/TextInputLayout.OutlinePrimary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/zone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/input_inventory_id">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    app:binding="@{view.zone}" />
+
+            </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_input_peso_lu.xml b/app/src/main/res/layout/dialog_input_peso_lu.xml
index ab314172..654b5440 100644
--- a/app/src/main/res/layout/dialog_input_peso_lu.xml
+++ b/app/src/main/res/layout/dialog_input_peso_lu.xml
@@ -20,7 +20,7 @@
 
         <variable
             name="view"
-            type="it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLuView" />
+            type="it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUView" />
     </data>
 
     <androidx.cardview.widget.CardView
@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:orientation="vertical"
-        app:cardCornerRadius="12dp"
+        app:cardCornerRadius="16dp"
         app:cardElevation="0dp">
 
         <androidx.appcompat.widget.LinearLayoutCompat
diff --git a/app/src/main/res/layout/dialog_input_quantity_v2.xml b/app/src/main/res/layout/dialog_input_quantity_v2.xml
index eec7a5c1..6b67d8f5 100644
--- a/app/src/main/res/layout/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml
@@ -732,7 +732,7 @@
                             android:visibility="@{viewmodel.canPartitaMagBeChanged() || viewmodel.partitaMag != null ? View.VISIBLE : View.GONE}"
                             tools:layout_weight="1">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_partita_mag_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -753,7 +753,7 @@
                             android:enabled="@{view.enabledChangePartitaMag}"
                             android:visibility="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? View.VISIBLE : View.GONE}">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_data_scad_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -788,7 +788,7 @@
                             android:paddingEnd="4dp"
                             tools:layout_weight="1">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_num_cnf_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -813,7 +813,7 @@
                             android:paddingEnd="4dp"
                             android:visibility="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? View.VISIBLE : View.GONE}">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_qta_cnf_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -837,16 +837,16 @@
                             android:focusableInTouchMode="false"
                             tools:layout_weight="1">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_qta_tot_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:digits="0123456789"
                                 android:hint="@string/tot_qty"
+                                android:imeOptions="actionDone"
                                 android:inputType="number"
                                 android:selectAllOnFocus="true"
-                                android:imeOptions="actionDone"
                                 app:binding="@{view.currentQtaTot}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
@@ -873,7 +873,7 @@
                             android:paddingEnd="4dp"
                             tools:layout_weight="1">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_tara_ped_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -896,7 +896,7 @@
                             android:focusableInTouchMode="false"
                             android:paddingEnd="4dp">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_tara_col_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -922,7 +922,7 @@
                             tools:enabled="false"
                             tools:layout_weight="1">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_peso_lordo_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -951,7 +951,7 @@
                             android:enabled="@{view.enabledNotes}"
                             android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }">
 
-                            <com.google.android.material.textfield.TextInputEditText
+                            <EditText
                                 android:id="@+id/input_note_text"
                                 style="@style/TextInputEditText.OutlinePrimary"
                                 android:layout_width="match_parent"
@@ -968,51 +968,49 @@
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="16dp"
+                        android:layout_marginTop="16dp"
                         android:gravity="center_horizontal"
                         android:orientation="horizontal"
-                        android:weightSum="1">
+                        android:weightSum="3">
 
-                        <com.google.android.material.button.MaterialButton
+                        <Button
+                            style="@style/Widget.Material3.Button.OutlinedButton"
                             android:id="@+id/close_lu_btn"
-                            style="@style/Button.PrimaryOutline"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="0dp"
                             android:layout_marginEnd="4dp"
-                            android:layout_weight="0.4"
+                            android:layout_weight="1"
                             android:onClick="@{() -> view.saveAndCloseLU()}"
                             android:text="@string/action_close_ul"
                             app:strokeColor="@color/colorPrimary"
                             app:visibility="@{view.enabledLUCloseButton}" />
 
 
-                        <com.google.android.material.button.MaterialButton
+                        <Button
                             android:id="@+id/abort_btn"
-                            style="@style/Button.DangerFull"
+                            style="@style/Button.DangerOutline"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="4dp"
                             android:layout_marginEnd="4dp"
-                            android:layout_weight="0.3"
+                            android:layout_weight="1"
                             android:onClick="@{() -> view.dismiss()}"
-                            android:paddingEnd="3dp"
-                            app:icon="@drawable/ic_close_24dp"
-                            app:iconGravity="textStart" />
+                            android:text="@string/abort"
+                            app:iconGravity="start" />
 
 
-                        <com.google.android.material.button.MaterialButton
+                        <Button
                             android:id="@+id/save_btn"
-                            style="@style/Button.PrimaryFull"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="4dp"
                             android:layout_marginEnd="0dp"
-                            android:layout_weight="0.3"
+                            android:layout_weight="1"
                             android:onClick="@{() -> view.save()}"
-                            android:paddingEnd="3dp"
+                            android:text="@string/action_save"
                             app:icon="@drawable/ic_save_24"
-                            app:iconGravity="textStart" />
+                            app:iconGravity="start" />
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/dialog_note_aggiuntive_nuova_ul.xml b/app/src/main/res/layout/dialog_note_aggiuntive_nuova_ul.xml
index a542f304..a457a835 100644
--- a/app/src/main/res/layout/dialog_note_aggiuntive_nuova_ul.xml
+++ b/app/src/main/res/layout/dialog_note_aggiuntive_nuova_ul.xml
@@ -17,7 +17,7 @@
 
         <variable
             name="view"
-            type="it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialog" />
+            type="it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLU" />
 
         <variable
             name="viewModel"
diff --git a/app/src/main/res/layout/dialog_scan_codice_griglia.xml b/app/src/main/res/layout/dialog_scan_codice_griglia.xml
index c43a4931..52af8c53 100644
--- a/app/src/main/res/layout/dialog_scan_codice_griglia.xml
+++ b/app/src/main/res/layout/dialog_scan_codice_griglia.xml
@@ -6,7 +6,7 @@
     <data>
         <variable
             name="view"
-            type="it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs.DialogScanLisAView" />
+            type="it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs.DialogScanGrigliaAcquistoView" />
     </data>
 
     <androidx.cardview.widget.CardView
diff --git a/app/src/main/res/layout/dialog_select_doc_info.xml b/app/src/main/res/layout/dialog_select_doc_info.xml
index 72e2f6d7..fc8e074f 100644
--- a/app/src/main/res/layout/dialog_select_doc_info.xml
+++ b/app/src/main/res/layout/dialog_select_doc_info.xml
@@ -134,7 +134,8 @@
                         android:focusableInTouchMode="false"
                         android:hint="@string/document_date"
                         android:inputType="text"
-                        app:binding="@{view.dataDoc}"/>
+                        app:binding="@{view.dataDoc}"
+                        app:parentView="@{view}"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/fragment_doc_interni.xml b/app/src/main/res/layout/fragment_doc_interni.xml
index 4854cade..ad26fce2 100644
--- a/app/src/main/res/layout/fragment_doc_interni.xml
+++ b/app/src/main/res/layout/fragment_doc_interni.xml
@@ -310,15 +310,14 @@
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/main_fab"
-            style="@style/Widget.MaterialComponents.FloatingActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            android:onClick="@{() -> viewModel.newDocument()}"
-            android:tint="@android:color/white"
+            android:layout_margin="16dp"
+            app:srcCompat="@drawable/ic_add_24dp"
             android:visibility="invisible"
-            app:srcCompat="@drawable/ic_add_24dp" />
+            app:singleClick="@{viewModel::newDocument}"
+            style="?attr/floatingActionButtonPrimaryStyle" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_elenco_inventario.xml b/app/src/main/res/layout/fragment_elenco_inventario.xml
new file mode 100644
index 00000000..2239f82d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_elenco_inventario.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="viewmodel"
+            type="it.integry.integrywmsnative.gest.inventario.ElencoInventariViewModel" />
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:context=".gest.inventario.ElencoInventariFragment">
+
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/inventario_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fadeScrollbars="true"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:itemCount="8"
+            tools:listitem="@layout/fragment_elenco_inventario_list_single_item" />
+
+
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="16dp"
+            app:srcCompat="@drawable/ic_add_24dp"
+            app:singleClick="@{() -> viewmodel.openInventario()}"
+            style="?attr/floatingActionButtonPrimaryStyle" />
+
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</layout>
\ No newline at end of file
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
new file mode 100644
index 00000000..373bb639
--- /dev/null
+++ b/app/src/main/res/layout/fragment_elenco_inventario_list_single_item.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
+
+        <variable
+            name="item"
+            type="it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO" />
+
+    </data>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:paddingStart="8dp"
+        android:paddingTop="12dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="12dp">
+
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/badge1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/badge_round_corner"
+            android:backgroundTint="@color/colorPrimary"
+            android:paddingLeft="8dp"
+            android:paddingTop="2dp"
+            android:paddingRight="8dp"
+            android:paddingBottom="2dp"
+            android:text="@{&quot;Numero &quot; + item.idInventario.toString()}"
+            android:textColor="@android:color/white"
+            android:textStyle="bold"
+            tools:text="Numero 670" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/badge2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/badge_round_corner"
+            android:backgroundTint="@color/red_400"
+            android:layout_marginStart="8dp"
+            android:paddingLeft="8dp"
+            android:paddingTop="2dp"
+            android:paddingRight="8dp"
+            android:paddingBottom="2dp"
+            android:layout_toEndOf="@+id/badge1"
+            android:text="@string/new_item"
+            android:textColor="@android:color/white"
+            android:visibility="gone"
+            android:textStyle="bold" />
+
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/date"
+            style="@style/AppTheme.NewMaterial.Text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_toEndOf="@+id/badge2"
+            android:text="@{UtilityDate.formatDate(item.dataInventario, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
+            android:textAlignment="textEnd"
+            android:textColor="@color/colorPrimaryGray"
+            android:textSize="14sp"
+            tools:text="13 Apr 2022" />
+
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@android:style/TextAppearance.Small"
+            android:alpha="0.6"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/badge1"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="4dp"
+            android:layout_toStartOf="@id/compilato_da"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:text="@string/not_synchronized"
+            app:reverse_visibility="@{item.syncronized}"/>
+
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@android:style/TextAppearance.Small"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/badge1"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="4dp"
+            android:layout_toStartOf="@id/compilato_da"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:text="@{&quot;Sincronizzato il &quot; + UtilityDate.formatDate(item.remoteSyncDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
+            app:visibility="@{item.syncronized}" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/compilato_da"
+            style="@style/AppTheme.NewMaterial.Text.Badge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/date"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="4dp"
+            android:text="@{item.inseritoDa}"
+            android:textSize="12sp"
+            tools:text="Nome Cognome" />
+    </RelativeLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index df8fae60..7c062d15 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -1,22 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
 
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <data>
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.gest.main.MainFragment" />
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout 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"
+        android:id="@+id/root_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/full_white"
         tools:context=".gest.main.MainFragment">
 
 
-
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-
             <net.cachapa.expandablelayout.ExpandableLayout
                 android:id="@+id/no_connection_top_layout"
                 android:layout_width="match_parent"
@@ -26,24 +31,19 @@
                 app:el_duration="400"
                 app:el_expanded="false">
 
-                <LinearLayout
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Small"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/red_600"
-                    android:orientation="vertical"
                     android:paddingStart="8dp"
-                    android:paddingEnd="8dp"
                     android:paddingTop="12dp"
-                    android:paddingBottom="12dp">
+                    android:paddingEnd="8dp"
+                    android:paddingBottom="12dp"
+                    android:text="NESSUNA CONNESSIONE DISPONIBILE, RIPROVA"
+                    android:textColor="@color/white" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="NESSUNA CONNESSIONE DISPONIBILE, RIPROVA"
-                        android:textColor="@color/white"
-                        style="@style/AppTheme.NewMaterial.Text.Small"/>
-
-                </LinearLayout>
 
             </net.cachapa.expandablelayout.ExpandableLayout>
 
@@ -53,37 +53,33 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
-
-
-                    <androidx.cardview.widget.CardView
+                    <RelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="12dp"
-                        app:cardElevation="4dp"
-                        app:cardCornerRadius="8dp">
+                        android:layout_height="wrap_content">
 
-                        <RelativeLayout
+                        <androidx.cardview.widget.CardView
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:background="@color/colorPrimary"
-                            android:paddingLeft="16dp"
-                            android:paddingTop="16dp"
-                            android:paddingRight="16dp"
-                            android:paddingBottom="16dp">
+                            android:layout_margin="12dp"
+                            app:cardCornerRadius="16dp"
+                            app:cardElevation="4dp">
 
 
                             <androidx.appcompat.widget.LinearLayoutCompat
+                                android:id="@+id/profile_root_container"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:orientation="vertical">
+                                android:background="@color/colorPrimary"
+                                android:orientation="vertical"
+                                android:padding="16dp">
 
 
-                                <LinearLayout
+                                <androidx.appcompat.widget.LinearLayoutCompat
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:gravity="center_vertical"
@@ -95,15 +91,18 @@
                                         android:layout_height="30dp"
                                         android:layout_marginEnd="16dp"
                                         android:adjustViewBounds="true"
+                                        android:clickable="true"
+                                        android:focusable="true"
+                                        app:multipleClick="@{() -> view.toggleEasterEggMode()}"
                                         android:src="@drawable/ic_outline_account_circle_48px"
                                         android:tint="@android:color/white" />
 
-                                    <LinearLayout
+                                    <androidx.appcompat.widget.LinearLayoutCompat
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         android:orientation="vertical">
 
-                                        <TextView
+                                        <androidx.appcompat.widget.AppCompatTextView
                                             android:id="@+id/current_user_name"
                                             style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
                                             android:layout_width="match_parent"
@@ -111,7 +110,7 @@
                                             android:textColor="@android:color/white"
                                             tools:text="Android Studio" />
 
-                                        <TextView
+                                        <androidx.appcompat.widget.AppCompatTextView
                                             android:id="@+id/current_deposito"
                                             style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
                                             android:layout_width="wrap_content"
@@ -119,9 +118,9 @@
                                             android:layout_marginTop="2dp"
                                             tools:text="android.studio@android.com" />
 
-                                    </LinearLayout>
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
 
-                                </LinearLayout>
+                                </androidx.appcompat.widget.LinearLayoutCompat>
 
 
                                 <net.cachapa.expandablelayout.ExpandableLayout
@@ -131,7 +130,7 @@
                                     app:el_duration="400"
                                     app:el_expanded="false">
 
-                                    <LinearLayout
+                                    <androidx.appcompat.widget.LinearLayoutCompat
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         android:layout_marginTop="16dp"
@@ -180,26 +179,41 @@
                                         </LinearLayout>
 
 
-                                    </LinearLayout>
+                                    </androidx.appcompat.widget.LinearLayoutCompat>
 
                                 </net.cachapa.expandablelayout.ExpandableLayout>
 
                             </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-                        </RelativeLayout>
+                        </androidx.cardview.widget.CardView>
 
 
-                    </androidx.cardview.widget.CardView>
+                        <net.cachapa.expandablelayout.ExpandableLayout
+                            android:id="@+id/easter_egg__horror_blood_expandable_layout"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginHorizontal="16dp"
+                            android:layout_marginTop="50dp"
+                            app:el_expanded="false">
 
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:id="@+id/easter_egg__horror_blood"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:adjustViewBounds="true"
+                                android:src="@drawable/easter_egg__horror_blood" />
+                        </net.cachapa.expandablelayout.ExpandableLayout>
 
+                    </RelativeLayout>
 
-                    <LinearLayout
+                    <androidx.appcompat.widget.LinearLayoutCompat
                         android:id="@+id/menu_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
-                    </LinearLayout>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/current_app_version_name"
@@ -209,10 +223,11 @@
                         android:textAlignment="center"
                         tools:text="v1.0.0" />
 
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
             </androidx.core.widget.NestedScrollView>
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
 
-    </FrameLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main_accettazione.xml b/app/src/main/res/layout/fragment_main_accettazione.xml
index 13233729..a968f396 100644
--- a/app/src/main/res/layout/fragment_main_accettazione.xml
+++ b/app/src/main/res/layout/fragment_main_accettazione.xml
@@ -85,15 +85,12 @@
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/accettazione_main_fab"
-            style="@style/Widget.MaterialComponents.FloatingActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            android:onClick="@{() -> view.dispatchOrders()}"
-            android:tint="@android:color/white"
+            android:layout_margin="16dp"
             app:srcCompat="@drawable/ic_check_black_24dp"
-            app:visibility="@{view.fabVisible}" />
+            style="?attr/floatingActionButtonPrimaryStyle" />
     </FrameLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main_menu_group_layout.xml b/app/src/main/res/layout/fragment_main_menu_group_layout.xml
index 67742385..c553e1d7 100644
--- a/app/src/main/res/layout/fragment_main_menu_group_layout.xml
+++ b/app/src/main/res/layout/fragment_main_menu_group_layout.xml
@@ -24,21 +24,6 @@
         tools:text="Group Title" />
 
 
-
-    <!--<GridLayout-->
-        <!--android:id="@+id/mainGrid"-->
-        <!--android:columnCount="2"-->
-        <!--android:columnOrderPreserved="true"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="0dp"-->
-        <!--app:layout_constraintTop_toBottomOf="@id/general_dashboard_group_title"-->
-        <!--app:layout_constraintStart_toStartOf="parent"-->
-        <!--app:layout_constraintEnd_toEndOf="parent"-->
-        <!--android:padding="14dp">-->
-
-    <!--</GridLayout>-->
-
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/main_list"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_main_menu_item_layout.xml b/app/src/main/res/layout/fragment_main_menu_item_layout.xml
index a3166541..bc4b06ba 100644
--- a/app/src/main/res/layout/fragment_main_menu_item_layout.xml
+++ b/app/src/main/res/layout/fragment_main_menu_item_layout.xml
@@ -7,13 +7,10 @@
         android:layout_margin="8dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:cardBackgroundColor="@android:color/white"
-        app:cardCornerRadius="4dp"
+        app:cardCornerRadius="16dp"
         app:cardElevation="4dp">
 
-
-
-        <LinearLayout
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_gravity="center_horizontal|center_vertical"
             android:gravity="center_horizontal"
             android:padding="8dp"
@@ -40,7 +37,7 @@
                 android:textStyle="bold"
                 style="@style/AppTheme.NewMaterial.Text.Small"/>
 
-        </LinearLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
     </com.google.android.material.card.MaterialCardView>
 
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 9e048f23..6a6ae8e4 100644
--- a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
+++ b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
@@ -298,7 +298,7 @@
 
                     <com.google.android.material.floatingactionbutton.FloatingActionButton
                         android:id="@+id/rettifica_giacenze_main_fab"
-                        style="@style/Widget.MaterialComponents.FloatingActionButton"
+                        style="?attr/floatingActionButtonPrimaryStyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -329,7 +329,9 @@
                 android:layout_height="wrap_content"
                 app:behavior_hideable="true"
                 app:behavior_peekHeight="0dp"
-                app:layout_behavior=".view.bottom_sheet__base.AutoCloseBottomSheetBehavior" />
+                app:layout_behavior=".view.bottom_sheet__base.AutoCloseBottomSheetBehavior"
+                app:parentView="@id/bottom_sheet__mtb_colr_edit"
+                app:backgroundView="@id/bottom_sheet__mtb_colr_edit__background"/>
 
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente.xml b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente.xml
index b5a1066e..68fc4dee 100644
--- a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente.xml
+++ b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente.xml
@@ -96,15 +96,13 @@
     </RelativeLayout>
 
 
-
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/main_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:tint="@android:color/white"
-        style="@style/Widget.MaterialComponents.FloatingActionButton"
-        app:srcCompat="@drawable/ic_check_black_24dp" />
+        android:layout_margin="16dp"
+        app:srcCompat="@drawable/ic_check_black_24dp"
+        style="?attr/floatingActionButtonPrimaryStyle" />
 </FrameLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_picking_libero.xml b/app/src/main/res/layout/fragment_picking_libero.xml
index 66b71f75..d25f296e 100644
--- a/app/src/main/res/layout/fragment_picking_libero.xml
+++ b/app/src/main/res/layout/fragment_picking_libero.xml
@@ -154,7 +154,9 @@
             android:layout_height="wrap_content"
             app:behavior_hideable="true"
             app:behavior_peekHeight="0dp"
-            app:layout_behavior=".view.bottom_sheet__base.AutoCloseBottomSheetBehavior" />
+            app:layout_behavior=".view.bottom_sheet__base.AutoCloseBottomSheetBehavior"
+            app:backgroundView="@id/bottom_sheet__mtb_colr_edit__background"
+            app:parentView="@id/bottom_sheet__mtb_colr_edit" />
 
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce.xml b/app/src/main/res/layout/fragment_prod_rientro_merce.xml
index 5e996160..a6f0d828 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce.xml
@@ -73,7 +73,9 @@
             android:layout_height="wrap_content"
             app:behavior_hideable="true"
             app:behavior_peekHeight="0dp"
-            app:layout_behavior=".view.bottom_sheet__base.AutoCloseBottomSheetBehavior" />
+            app:layout_behavior=".view.bottom_sheet__base.AutoCloseBottomSheetBehavior"
+            app:parentView="@id/bottom_sheet__mtb_colr_edit"
+            app:backgroundView="@id/bottom_sheet__mtb_colr_edit__background" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_prod_versamento_materiale.xml b/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
index 1a4021e3..2c7121ab 100644
--- a/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
+++ b/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
@@ -184,11 +184,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            android:tint="@android:color/white"
+            android:layout_margin="16dp"
+            app:srcCompat="@drawable/ic_check_black_24dp"
             app:visibility="@{view.fabVisible}"
             app:singleClick="@{view::onConfirmClicked}"
-            style="@style/Widget.MaterialComponents.FloatingActionButton"
-            app:srcCompat="@drawable/ic_check_black_24dp" />
+            style="?attr/floatingActionButtonPrimaryStyle" />
     </FrameLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore.xml b/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore.xml
index fc6272ce..ac053f79 100644
--- a/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore.xml
+++ b/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore.xml
@@ -98,15 +98,13 @@
         </RelativeLayout>
 
 
-
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/main_fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            android:tint="@android:color/white"
-            style="@style/Widget.MaterialComponents.FloatingActionButton"
-            app:srcCompat="@drawable/ic_check_black_24dp" />
+            android:layout_margin="16dp"
+            app:srcCompat="@drawable/ic_check_black_24dp"
+            style="?attr/floatingActionButtonPrimaryStyle" />
     </FrameLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
index 50883ad9..d864f80a 100644
--- a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
+++ b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
@@ -19,7 +19,7 @@
         android:padding="8dp">
 
 
-        <LinearLayout
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/linearLayout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -80,7 +80,7 @@
             </RelativeLayout>
 
 
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
@@ -92,7 +92,7 @@
                 tools:text="Descrizione lunga articolo" />
 
 
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
@@ -101,7 +101,7 @@
                 style="@style/AppTheme.NewMaterial.Text.Small"
                 tools:text="Lotto: ABCDE" />
 
-        </LinearLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
 
         <RelativeLayout
diff --git a/app/src/main/res/menu/picking_inventario_menu.xml b/app/src/main/res/menu/picking_inventario_menu.xml
new file mode 100644
index 00000000..d76021b3
--- /dev/null
+++ b/app/src/main/res/menu/picking_inventario_menu.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/export"
+        android:title="@string/action_export"
+        android:icon="@drawable/ic_black_upload"
+        android:contentDescription="@string/action_export"
+        app:showAsAction="always" />
+
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e575dfce..033283c3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -21,6 +21,7 @@
     <string name="accettazione_ordine_inevaso_title_multiple_order">Ordini di accettazione</string>
     <string name="vendita_title_fragment">Spedizione</string>
     <string name="rettifica_giacenze_fragment_title">Rettifica giacenze</string>
+    <string name="inventario_fragment_title">Inventario</string>
     <string name="prod_fabbisogno_linee_prod_title">Approvvig. linee prod.</string>
     <string name="versamento_merce_fragment_title">Posizionamento merce</string>
     <string name="error">Errore</string>
@@ -63,6 +64,7 @@
     <string name="action_print_ul">Stampa UL</string>
     <string name="action_print">Stampa</string>
     <string name="confirm">Conferma</string>
+    <string name="action_save">Salva</string>
     <string name="hint_additional_notes">Note Aggiuntive</string>
     <string name="dialog_message_additional_notes">Inserisci eventuali note aggiuntive della tua UL</string>
     <string name="lu_scan_not_granted_here">Non è possibile scansionare il barcode di una UL adesso</string>
@@ -226,6 +228,8 @@
     <string name="num_ords">Numero ordine</string>
     <string name="order_cod_jcoms">Commessa</string>
     <string name="customer">Cliente</string>
+    <string name="inventory_id">ID Inventario</string>
+    <string name="zone">Zona</string>
     <string name="job">Commessa</string>
     <string name="recipient">Destinatario</string>
     <string name="ship_date">Data consegna</string>
@@ -381,6 +385,7 @@
     <string name="prod_count">Numero articoli:</string>
     <string name="edit_doc">Modifica documento</string>
     <string name="export_document">Esporta documento</string>
+    <string name="action_export">Esporta</string>
     <string name="save_document">Salva documento</string>
     <string name="fornitore">Fornitore</string>
     <string name="cod_anag_name">Fornitore</string>
@@ -422,4 +427,7 @@
     <string name="no_arts_found">Nessun articolo compatibile trovato</string>
     <string name="empty_lu">UL vuota</string>
     <string name="ord_ven_qta_omaggio"><![CDATA[Qta omaggio: <b>%s %s</b>]]></string>
+    <string name="activity_picking_inventario_title">Inventario</string>
+    <string name="not_synchronized">Non sincronizzato</string>
+    <string name="new_item">Nuovo</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 4e7f2483..a9e9cd76 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -6,4 +6,18 @@
 	    <attr name="fastscroll__handleColor" format="color" />
 	    <attr name="fastscroll__bubbleTextAppearance" format="reference" />
 	</declare-styleable>
+
+
+	<attr name="backgroundView" format="reference" />
+	<attr name="parentView" format="reference" />
+
+	<declare-styleable name="BottomSheetItemEditView">
+		<attr name="backgroundView" />
+		<attr name="parentView" />
+	</declare-styleable>
+
+	<declare-styleable name="BottomSheetInventarioActionsView">
+		<attr name="backgroundView" />
+		<attr name="parentView" />
+	</declare-styleable>
 </resources>
diff --git a/app/src/main/res/values/buttons_style.xml b/app/src/main/res/values/buttons_style.xml
index 894166d2..173e230e 100644
--- a/app/src/main/res/values/buttons_style.xml
+++ b/app/src/main/res/values/buttons_style.xml
@@ -22,15 +22,11 @@
     </style>
 
 
-    <style name="Button.DangerOutline" parent="Widget.MaterialComponents.Button.OutlinedButton">
-        <!--        <item name="fontFamily">@font/product_sans_regular</item> &lt;!&ndash; target android sdk versions < 26 and > 14 if theme other than AppCompat &ndash;&gt;-->
-        <!--        <item name="android:textStyle">bold</item>-->
-        <!--        <item name="android:textAllCaps">false</item>-->
+    <style name="Button.DangerOutline" parent="Widget.Material3.Button.OutlinedButton">
         <item name="android:textColor">@color/red_400</item>
-        <!--        <item name="android:paddingTop">8dp</item>-->
-        <!--        <item name="android:paddingBottom">8dp</item>-->
         <item name="backgroundTint">@android:color/white</item>
         <item name="iconTint">@color/red_400</item>
+        <item name="strokeColor">@color/red_400</item>
     </style>
 
     <style name="Button.DangerFull" parent="Widget.Material3.Button.UnelevatedButton">
diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml
index 189b3627..e505f087 100644
--- a/app/src/main/res/values/config.xml
+++ b/app/src/main/res/values/config.xml
@@ -15,6 +15,7 @@
     <item name="nav_accettazione" type="id" />
     <item name="nav_spedizione" type="id" />
     <item name="nav_rettifica_giacenze" type="id" />
+    <item name="nav_inventario" type="id" />
     <item name="nav_versamento_merce" type="id" />
     <item name="nav_free_picking" type="id" />
     <item name="nav_free_lav_picking" type="id" />
diff --git a/app/src/main/res/values/custom_colors.xml b/app/src/main/res/values/custom_colors.xml
index f896ab54..e578d4b2 100644
--- a/app/src/main/res/values/custom_colors.xml
+++ b/app/src/main/res/values/custom_colors.xml
@@ -21,6 +21,7 @@
     <color name="half_black">#808080</color>
 
     <!-- EMPTY VIEW -->
+    <color name="bottom_sheet_background_color">#99000000</color>
     <color name="empty_view_gray">#bdbdbd</color>
     <color name="empty_view_bg_gray">#f5f5f5</color>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1240cf05..a1847060 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,6 +59,7 @@
     <string name="accettazione_ordine_inevaso_title_multiple_order">Multiple acceptance orders</string>
     <string name="vendita_title_fragment">Check out</string>
     <string name="rettifica_giacenze_fragment_title">Inventory</string>
+    <string name="inventario_fragment_title">Inventory</string>
     <string name="prod_fabbisogno_linee_prod_title">Production line requirements</string>
     <string name="versamento_merce_fragment_title">Items placement</string>
     <string name="free_picking_title_fragment">Free picking</string>
@@ -100,6 +101,7 @@
     <string name="action_print_ul">Print LU</string>
     <string name="action_print">Print</string>
     <string name="confirm">Confirm</string>
+    <string name="action_save">Save</string>
     <string name="hint_additional_notes">Additional notes</string>
     <string name="dialog_message_additional_notes">Enter any additional notes in your logistics unit</string>
     <string name="logistic_unit">LU</string>
@@ -231,6 +233,8 @@
     <string name="num_ords">Orders number</string>
     <string name="order_cod_jcoms">Orders job</string>
     <string name="customer">Customer</string>
+    <string name="inventory_id">Inventory ID</string>
+    <string name="zone">Zone</string>
     <string name="job">Job</string>
     <string name="recipient">Recipient</string>
     <string name="ship_date">Ship date</string>
@@ -387,6 +391,7 @@
     <string name="prod_count">Products count:</string>
     <string name="edit_doc">Edit document</string>
     <string name="export_document">Export document</string>
+    <string name="action_export">Export</string>
     <string name="save_document">Save document</string>
     <string name="fornitore">Supplier</string>
     <string name="cod_anag_name">Supplier</string>
@@ -428,4 +433,9 @@
     <string name="no_arts_found">No product found</string>
     <string name="empty_lu">Empty LU</string>
     <string name="ord_ven_qta_omaggio"><![CDATA[Free qty: <b>%s %s</b>]]></string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="activity_picking_inventario_title">Inventory</string>
+    <string name="not_synchronized">Not synchronized</string>
+    <string name="new_item">New</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2ad557ad..d707ae7f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,7 +19,29 @@
 
 <!--    </style>-->
 
-    <style name="AppTheme.NoActionBar">
+
+    <style name="Light" parent="Theme.Material3.Light.NoActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
+        <item name="android:statusBarColor">@android:color/white</item>
+
+        <item name="fontFamily">@font/google_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
+
+        <item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
+        <item name="materialCalendarFullscreenTheme">@style/Widget.Material3.MaterialCalendar.Fullscreen</item>
+        <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
+
+        <item name="bottomSheetDialogTheme">@style/CustomBottomSheetDialog</item>
+    </style>
+
+
+    <style name="SplashTheme" parent="AppTheme.NoActionBar">
+        <item name="android:windowBackground">@drawable/splash_background</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar" parent="@style/Light">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
@@ -123,27 +145,6 @@
 
 
 
-    <style name="SplashTheme" parent="AppTheme.NoActionBar">
-        <item name="android:windowBackground">@drawable/splash_background</item>
-    </style>
-
-    <style name="Light" parent="Theme.Material3.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
-        <item name="android:statusBarColor">@android:color/white</item>
-
-        <item name="fontFamily">@font/google_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
-
-        <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
-        <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
-        <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
-
-        <item name="bottomSheetDialogTheme">@style/CustomBottomSheetDialog</item>
-    </style>
-
-
     <style name="OrangeFloatingLabel" parent="@android:style/TextAppearance">
         <item name="colorAccent">@color/orange_600</item>
         <item name="android:textColor">@color/orange_600</item>
@@ -193,32 +194,32 @@
     </style>
 
 
-    <style name="MaterialToolbar.Base" parent="">
-        <item name="popupTheme">@style/AppTheme.PopupOverlay</item>
-        <item name="theme">@style/Theme.Material3.Light</item>
-    </style>
+<!--    <style name="MaterialToolbar.Base" parent="">-->
+<!--        <item name="popupTheme">@style/AppTheme.PopupOverlay</item>-->
+<!--        <item name="theme">@style/Theme.Material3.Light</item>-->
+<!--    </style>-->
 
-    <style name="MaterialToolbar" parent="MaterialToolbar.Base"/>
+<!--    <style name="MaterialToolbar" parent="MaterialToolbar.Base"/>-->
 
-    <style name="MaterialToolbar.Event" parent="MaterialToolbar">
-        <item name="titleTextAppearance">@style/AppTheme.NewMaterial.Text.ToolbarTitle</item>
-    </style>
+<!--    <style name="MaterialToolbar.Event" parent="MaterialToolbar">-->
+<!--        <item name="titleTextAppearance">@style/AppTheme.NewMaterial.Text.ToolbarTitle</item>-->
+<!--    </style>-->
 
     <style name="CustomBottomSheetDialog" parent="@style/ThemeOverlay.Material3.BottomSheetDialog">
-        <item name="bottomSheetStyle">@style/CustomBottomSheet</item>
+        <item name="bottomSheetStyle">@style/Widget.Material3.BottomSheet</item>
     </style>
 
-    <style name="CustomBottomSheet" parent="Widget.Material3.BottomSheet">
-        <item name="shapeAppearanceOverlay">@style/CustomShapeAppearanceBottomSheetDialog</item>
-    </style>
+<!--    <style name="CustomBottomSheet" parent="Widget.Material3.BottomSheet">-->
+<!--        <item name="shapeAppearanceOverlay">@style/CustomShapeAppearanceBottomSheetDialog</item>-->
+<!--    </style>-->
 
-    <style name="CustomShapeAppearanceBottomSheetDialog" parent="">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSizeTopRight">16dp</item>
-        <item name="cornerSizeTopLeft">16dp</item>
-        <item name="cornerSizeBottomRight">0dp</item>
-        <item name="cornerSizeBottomLeft">0dp</item>
-    </style>
+<!--    <style name="CustomShapeAppearanceBottomSheetDialog" parent="">-->
+<!--        <item name="cornerFamily">rounded</item>-->
+<!--        <item name="cornerSizeTopRight">16dp</item>-->
+<!--        <item name="cornerSizeTopLeft">16dp</item>-->
+<!--        <item name="cornerSizeBottomRight">0dp</item>-->
+<!--        <item name="cornerSizeBottomLeft">0dp</item>-->
+<!--    </style>-->
 
 
 </resources>