diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index af6a9970..028e332f 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
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 9d10a038..c272b95c 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
@@ -103,7 +103,7 @@ public class Converters {
 
 
         final DecimalFormat decimalFormat = new DecimalFormat();
-        decimalFormat.setMaximumFractionDigits(2);
+        decimalFormat.setMaximumFractionDigits(3);
         decimalFormat.setDecimalFormatSymbols(otherSymbols);
 
         Pair<BindableFloat, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
index 238a8c25..2fc55863 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
@@ -123,7 +123,7 @@ public class MtbColr extends EntityBase implements Parcelable {
             numCnf = new BigDecimal(in.readFloat());
         }
 
-        in.readParcelable(MtbAart.class.getClassLoader());
+        mtbAart = in.readParcelable(MtbAart.class.getClassLoader());
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
index 429a7e88..d6277819 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
@@ -139,7 +139,7 @@ public class MtbColt extends EntityBase implements Parcelable {
 
 
 
-        in.readTypedList(mtbColr, MtbColr.CREATOR);
+        in.readList(mtbColr, MtbColr.class.getClassLoader());
 
 
     }
@@ -228,7 +228,7 @@ public class MtbColt extends EntityBase implements Parcelable {
             dest.writeFloat(altezzaCm.floatValue());
         }
 
-        dest.writeTypedList(mtbColr);
+        dest.writeList(mtbColr);
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java
index 0d42f5e1..dce2379e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java
@@ -70,7 +70,7 @@ public class ListaBancaliActivity extends AppCompatActivity {
             // Make sure the request was successful
             if (resultCode == RESULT_OK) {
 
-//                MtbColt recoveredMtbColt = data.getParcelableExtra("key");
+                MtbColt recoveredMtbColt = data.getParcelableExtra("key");
 
 
                 this.setResult(RESULT_OK, data);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
index dc357629..3fb0ff5c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
@@ -290,6 +290,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
         qtaDto.setQtaTot(mtbAart.getQtaCnf());
 
         qtaDto.setQtaDaEvadere(new BigDecimal(-1));
+        qtaDto.setQtaDisponibile(new BigDecimal(-1));
 
         qtaDto.setCanPartitaMagBeChanged(true);
         qtaDto.setCanDataScadBeChanged(true);
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
index 83bdde45..06d1b561 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
@@ -459,7 +459,7 @@ public class DialogInputQuantity {
                     if (!quantityDTO.blockedQtaTot.get()) {
 
                         quantityDTO.qtaTotNotificationEnabled = false;
-                        quantityDTO.qtaTot.set((float) Math.round(quantityDTO.qtaCnf.get(true) * quantityDTO.numCnf.get(true) * 100) / 100);
+                        quantityDTO.qtaTot.set((float) Math.round(quantityDTO.qtaCnf.get(true) * quantityDTO.numCnf.get(true) * 1000) / 1000);
                         quantityDTO.qtaTotNotificationEnabled = true;
 
 
@@ -467,9 +467,9 @@ public class DialogInputQuantity {
 
                         quantityDTO.qtaCnfNotificationEnabled = false;
                         if(quantityDTO.numCnf.get(true) != 0) {
-                            quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / quantityDTO.numCnf.get(true) * 100) / 100);
+                            quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / quantityDTO.numCnf.get(true) * 1000) / 1000);
                         } else {
-                            quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / 1 * 100) / 100);
+                            quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / 1 * 1000) / 1000);
                         }
                         quantityDTO.qtaCnfNotificationEnabled = true;
 
@@ -494,7 +494,7 @@ public class DialogInputQuantity {
                     if (!quantityDTO.blockedQtaTot.get()) {
 
                         quantityDTO.qtaTotNotificationEnabled = false;
-                        quantityDTO.qtaTot.set((float) Math.round(quantityDTO.qtaCnf.get(true) * quantityDTO.numCnf.get(true) * 100) / 100);
+                        quantityDTO.qtaTot.set((float) Math.round(quantityDTO.qtaCnf.get(true) * quantityDTO.numCnf.get(true) * 1000) / 1000);
                         quantityDTO.qtaTotNotificationEnabled = true;
 
                     } else if (!quantityDTO.blockedNumDiCnf.get()) {
@@ -529,7 +529,7 @@ public class DialogInputQuantity {
                     if(!quantityDTO.blockedQtaPerCnf.get()){
 
                         quantityDTO.qtaCnfNotificationEnabled = false;
-                        quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / quantityDTO.numCnf.get(true) *100)/100);
+                        quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / quantityDTO.numCnf.get(true) *1000)/1000);
                         quantityDTO.qtaCnfNotificationEnabled = true;
 
                     } else if(!quantityDTO.blockedNumDiCnf.get()) {
diff --git a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list___cod_art_for_group_model.xml b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list___cod_art_for_group_model.xml
index ad907c78..f3137fd7 100644
--- a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list___cod_art_for_group_model.xml
+++ b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list___cod_art_for_group_model.xml
@@ -49,13 +49,13 @@
                 android:orientation="horizontal"
                 android:gravity="right">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textStyle="bold"
-                    android:textColor="@color/green_700"
-                    style="@android:style/TextAppearance.Medium"
-                    android:text="@string/dispatched"/>
+                <!--<TextView-->
+                    <!--android:layout_width="wrap_content"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:textStyle="bold"-->
+                    <!--android:textColor="@color/green_700"-->
+                    <!--style="@android:style/TextAppearance.Medium"-->
+                    <!--android:text="@string/dispatched"/>-->
 
                 <TextView
                     android:id="@+id/accettazione_ordine_inevaso_main_list_group_item_qta_evasa"
diff --git a/app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml b/app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml
index ddc3f1d2..e977c145 100644
--- a/app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml
+++ b/app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml
@@ -12,37 +12,55 @@
             type="it.integry.integrywmsnative.core.model.MtbAart"/>
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:paddingTop="8dp"
         android:paddingBottom="8dp">
 
 
         <LinearLayout
             android:id="@+id/linearLayout"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@{mtbAart.codMart}"
-                android:textColor="@color/colorPrimary"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                tools:text="COD MART" />
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{mtbAart.codMart}"
+                    android:textColor="@color/colorPrimary"
+                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    tools:text="COD MART" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{mtbAart.diacod}"
+                    android:textColor="@color/red_600"
+                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    android:visibility="@{UtilityString.isNullOrEmpty(mtbAart.diacod) ? View.INVISIBLE : View.VISIBLE}"
+                    android:layout_alignParentEnd="true"
+                    tools:text="DIACOD"/>
+            </RelativeLayout>
+
 
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
-                android:maxLines="2"
                 android:text="@{mtbAart.descrizioneEstesa}"
                 android:textColor="@android:color/black"
                 android:textSize="16sp"
@@ -87,5 +105,5 @@
 
         </RelativeLayout>-->
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml
index 85b0ccb2..edb03fa9 100644
--- a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml
+++ b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml
@@ -96,7 +96,7 @@
                     android:paddingTop="2dp"
                     android:paddingRight="6dp"
                     android:paddingBottom="2dp"
-                    android:text="@{UtilityNumber.decimalToString(checkableMtbColr.mtbColr.getQtaCol()) + `\n` + checkableMtbColr.mtbColr.getUntMis()}"
+                    android:text="@{UtilityNumber.decimalToString(checkableMtbColr.mtbColr.getQtaCol()) + (checkableMtbColr.mtbColr.mtbAart != null &amp;&amp; !UtilityString.isNullOrEmpty(checkableMtbColr.mtbColr.mtbAart.untMis) ? `\n` + checkableMtbColr.mtbColr.mtbAart.untMis : ``)}"
                     android:textSize="16sp"
                     android:textColor="@android:color/white"
                     android:textStyle="bold"
diff --git a/app/src/main/res/layout/dialog_input_quantity_articolo.xml b/app/src/main/res/layout/dialog_input_quantity_articolo.xml
index 278f9fe3..158cdae9 100644
--- a/app/src/main/res/layout/dialog_input_quantity_articolo.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_articolo.xml
@@ -22,6 +22,8 @@
 
     <import type="android.graphics.Color" />
 
+    <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
 </data>
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -39,15 +41,28 @@
             android:layout_height="wrap_content">
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/dialog_title_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
-                android:text='@{(viewmodel.codArtFor != null ? viewmodel.codArtFor : viewmodel.mtbAart.codMart) + (viewmodel.batchLot != null ? " (" + viewmodel.batchLot + ")" : "") }'
-                android:textColor="#000"
+                android:text='@{viewmodel.mtbAart.codMart + (!UtilityString.isNullOrEmpty(viewmodel.batchLot) ? " (" + viewmodel.batchLot + ")" : "") }'
+                android:textColor="@color/colorPrimary"
                 android:textSize="18sp"
                 android:textStyle="bold"
                 tools:text="AV25D200010B"/>
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_below="@id/dialog_title_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:text='@{!UtilityString.isNullOrEmpty(viewmodel.mtbAart.diacod) ? viewmodel.mtbAart.diacod : ""}'
+                android:textColor="@color/red_600"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:visibility="@{UtilityString.isNullOrEmpty(viewmodel.mtbAart.diacod) ? View.GONE : View.VISIBLE}"
+                tools:text="DIACOD HERE"/>
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -74,12 +89,12 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/description"
-                    android:textSize="16sp"
-                    tools:text="Descrizione" />
+                <!--<androidx.appcompat.widget.AppCompatTextView-->
+                    <!--android:layout_width="wrap_content"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:text="@string/description"-->
+                    <!--android:textSize="16sp"-->
+                    <!--tools:text="Descrizione" />-->
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml
index d0008eee..8c7f6423 100644
--- a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml
+++ b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml
@@ -80,7 +80,7 @@
                 android:paddingTop="2dp"
                 android:paddingRight="6dp"
                 android:paddingBottom="2dp"
-                android:text="@{UtilityNumber.decimalToString(mtbColr.getQtaCol()) + `\n` + mtbColr.getUntMis()}"
+                android:text="@{UtilityNumber.decimalToString(mtbColr.getQtaCol()) + (mtbColr.mtbAart != null &amp;&amp; !UtilityString.isNullOrEmpty(mtbColr.mtbAart.untMis) ? `\n` + mtbColr.mtbAart.untMis : ``)}"
                 android:textSize="16sp"
                 android:textColor="@android:color/white"
                 android:textStyle="bold"
diff --git a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
index b0c8e852..b057bd18 100644
--- a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
+++ b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
@@ -80,7 +80,7 @@
                 android:paddingTop="2dp"
                 android:paddingRight="6dp"
                 android:paddingBottom="2dp"
-                android:text="@{UtilityNumber.decimalToString(mtbColr.getQtaCol()) + `\n` + mtbColr.getUntMis()}"
+                android:text="@{UtilityNumber.decimalToString(mtbColr.getQtaCol()) + (mtbColr.mtbAart != null &amp;&amp; !UtilityString.isNullOrEmpty(mtbColr.mtbAart.untMis) ? `\n` + mtbColr.mtbAart.untMis : ``)}"
                 android:textSize="16sp"
                 android:textColor="@android:color/white"
                 android:textStyle="bold"
diff --git a/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml b/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml
index 1cae5156..c0b0459a 100644
--- a/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml
+++ b/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml
@@ -49,13 +49,13 @@
                 android:orientation="horizontal"
                 android:gravity="right">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textStyle="bold"
-                    android:textColor="@color/green_700"
-                    style="@android:style/TextAppearance.Medium"
-                    android:text="@string/dispatched"/>
+                <!--<TextView-->
+                    <!--android:layout_width="wrap_content"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:textStyle="bold"-->
+                    <!--android:textColor="@color/green_700"-->
+                    <!--style="@android:style/TextAppearance.Medium"-->
+                    <!--android:text="@string/dispatched"/>-->
 
                 <TextView
                     android:id="@+id/vendita_ordine_inevaso_main_list_group_item_qta_evasa"
diff --git a/waterfall_toolbar/build.gradle b/waterfall_toolbar/build.gradle
index ad7742b7..ad3e5229 100644
--- a/waterfall_toolbar/build.gradle
+++ b/waterfall_toolbar/build.gradle
@@ -29,7 +29,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     // google
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha01'
+    implementation 'com.google.android.material:material:1.1.0-alpha02'
     implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.1'