diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java
index c19968d8..4723cd6b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java
@@ -42,7 +42,7 @@ public class ColliDataRecoverService {
     }
 
     public boolean thereIsAnExistantSession() {
-        return mtbColtsSessions.size() > 0;
+        return mtbColtsSessions != null && mtbColtsSessions.size() > 0;
     }
 
     public List<Integer> getAllSessionIDs() {
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 78f32639..09102422 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
@@ -119,6 +119,7 @@ public class MtbColt extends EntityBase {
         switch (gestioneEnum) {
             case ACQUISTO:
             case LAVORAZIONE:
+            case PRODUZIONE:
                 if(SettingsManager.iDB().getInternalCodAnags() == null) break;
 
                 Optional<InternalCodAnagsDTO> optCodAnagForn = Stream.of(SettingsManager.iDB().getInternalCodAnags())
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 e01b7eda..56fb3f68 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
@@ -258,10 +258,6 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("PRODUZIONE")
                 .setKeySection("FLAG_VERSAMENTO_DIRETTO"));
-        stbGestSetupList.add(new StbGestSetup()
-                .setGestName("PICKING")
-                .setSection("PRODUZIONE")
-                .setKeySection("DEFAULT_COD_ANAG"));
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -324,7 +320,6 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagAskPesoColloSpedizione(getValueFromList(list, "SETUP", "FLAG_ASK_PESO_COLLO", Boolean.class));
             dbSettingsModelIstance.setFlagUseNewPickingListSpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_USE_NEW_PICKING_LIST", Boolean.class));
             dbSettingsModelIstance.setFlagVersamentoDirettoProduzione(getValueFromList(list, "PRODUZIONE", "FLAG_VERSAMENTO_DIRETTO", Boolean.class));
-            dbSettingsModelIstance.setProduzioneDefaultCodAnag(getValueFromList(list, "PRODUZIONE", "DEFAULT_COD_ANAG", String.class));
             dbSettingsModelIstance.setFlagSpedizioneEnableManualPick(getValueFromList(list, "SPEDIZIONE", "ENABLE_MANUAL_PICK", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneEnableFakeGiacenza(getValueFromList(list, "SPEDIZIONE", "ENABLE_FAKE_GIACENZA", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneCanSelectMultipleOrders(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_SELECT_MULTIPLE_ORDERS", Boolean.class));
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
index 4b11eb30..92e8382e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
@@ -246,7 +246,7 @@ public class PickingLiberoViewModel {
         MtbColt mtbColt = new MtbColt();
         mtbColt.initDefaultFields(mDefaultGestione)
                 .setRifOrd(mDefaultGestione == GestioneEnum.LAVORAZIONE ? "PICKING LIBERO" : null)
-                .setCodAnag(SettingsManager.iDB().getProduzioneDefaultCodAnag())
+//                .setCodAnag(SettingsManager.iDB().getProduzioneDefaultCodAnag())
                 .setSegno(-1)
                 .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
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 688eaf0e..c749808e 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
@@ -57,738 +57,744 @@
             </androidx.appcompat.widget.Toolbar>
 
 
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="0dp"
+            <ScrollView
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="16dp"
-                android:orientation="vertical"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/toolbar">
 
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Dialog.DialogTitleText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:text="@{viewmodel.mtbAart.codMart}"
-                    android:textColor="@color/colorPrimary"
-                    tools:text="COD MART (Partita mag)" />
-
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Dialog.DialogSubTitleText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:text="@{viewmodel.mtbAart.diacod}"
-                    android:textColor="@color/red_600"
-                    android:visibility="@{UtilityString.isNullOrEmpty(viewmodel.mtbAart.diacod) ? View.GONE : View.VISIBLE}"
-                    tools:text="DIACOD" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:singleLine="false"
-                    android:text="@{viewmodel.mtbAart.descrizioneEstesa}"
-                    tools:text="RAD 25 D H/L 200 - 10 EL B BIANCO" />
-
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:visibility="@{viewmodel.totalNumCnfOrd != null || viewmodel.totalQtaOrd != null ? View.VISIBLE : View.GONE}">
-
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_toStartOf="@id/qta_ord_panel"
-                        android:text="@string/total_ordered"
-                        android:textColor="@android:color/black" />
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:id="@+id/qta_ord_panel"
-                        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.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfOrd)}"
-                            android:textColor="@android:color/black"
-                            android:textStyle="bold" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_marginStart="4dp"
-                            android:text="@string/unt_mis_col"
-                            android:textColor="@android:color/black"
-                            android:textStyle="bold" />
-
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_marginStart="4dp"
-                            android:text="("
-                            android:textColor="@android:color/black"
-                            android:textStyle="bold" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="0dp"
-                            android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaOrd)}"
-                            android:textColor="@android:color/black"
-                            android:textStyle="bold" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_marginStart="2dp"
-                            android:text="@{viewmodel.mtbAart.untMis}"
-                            android:textColor="@android:color/black"
-                            android:textStyle="bold" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_marginStart="0dp"
-                            android:text=")"
-                            android:textColor="@android:color/black"
-                            android:textStyle="bold" />
-
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="2dp"
-                    android:gravity="center"
-                    android:visibility="@{view.currentTextNumCnfToTake > 0 || view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}">
-
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:id="@+id/qta_ord_text_panel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/badge_round_corner"
-                        android:backgroundTint="@color/light_blue_100"
-                        android:gravity="center"
-                        android:orientation="horizontal"
-                        android:paddingHorizontal="12dp"
-                        android:paddingVertical="4dp">
-
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:src="@drawable/ic_info_78dp"
-                            android:tint="@color/gray_600" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="4dp"
-                            android:text="@{view.currentTextNumCnfToTake.toString()}"
-                            android:textColor="@color/gray_600"
-                            android:textStyle="bold"
-                            android:visibility="@{view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}"
-                            tools:text="1" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_marginStart="4dp"
-                            android:text="@{@plurals/item_package(view.currentTextNumCnfToTake)}"
-                            android:textColor="@color/gray_600"
-                            android:textStyle="bold"
-                            android:visibility="@{view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}"
-                            tools:text="conf" />
-
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_marginStart="4dp"
-                            android:text="e"
-                            android:textColor="@color/gray_600"
-                            android:visibility="@{view.currentTextNumPezziToTake > 0 &amp;&amp; view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="4dp"
-                            android:text="@{view.currentTextNumPezziToTake.toString()}"
-                            android:textColor="@color/gray_600"
-                            android:textStyle="bold"
-                            android:visibility="@{view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}"
-                            tools:text="4" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_marginStart="2dp"
-                            android:text="@{@plurals/pieces(view.currentTextNumPezziToTake)}"
-                            android:textAllCaps="false"
-                            android:textColor="@color/gray_600"
-                            android:textStyle="bold"
-                            android:visibility="@{view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}"
-                            tools:text="Pezzi" />
-
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                </RelativeLayout>
-
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:gravity="center"
-                    android:orientation="horizontal"
-                    android:weightSum="1">
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginEnd="2dp"
-                        android:layout_weight="0.5"
-                        android:background="@drawable/badge_round_corner"
-                        android:backgroundTint="@color/green_600"
-                        android:orientation="vertical"
-                        android:padding="8dp"
-                        android:visibility="@{viewmodel.totalNumCnfToBeTaken != null || viewmodel.totalQtaToBeTaken != null ? View.VISIBLE : View.GONE}">
-
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="@string/to_be_taken"
-                            android:textColor="@android:color/white" />
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:orientation="horizontal">
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfToBeTaken)}"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentEnd="true"
-                                android:layout_marginStart="4dp"
-                                android:text="@string/unt_mis_col"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold" />
-
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:orientation="horizontal">
-
-
-                            <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:layout_marginStart="4dp"
-                                android:text="("
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="0dp"
-                                android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaToBeTaken)}"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold" />
-
-                            <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:layout_marginStart="2dp"
-                                android:text="@{viewmodel.mtbAart.untMis}"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold" />
-
-                            <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:layout_marginStart="0dp"
-                                android:text=")"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold" />
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="2dp"
-                        android:layout_weight="0.5"
-                        android:background="@drawable/badge_round_corner"
-                        android:backgroundTint="@color/colorPrimary"
-                        android:orientation="vertical"
-                        android:padding="8dp"
-                        android:visibility="@{viewmodel.totalNumCnfAvailable != null || viewmodel.totalQtaAvailable != null ? View.VISIBLE : View.GONE}">
-
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="@string/total_available"
-                            android:textColor="@android:color/white" />
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:orientation="horizontal">
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfAvailable)}"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentEnd="true"
-                                android:layout_marginStart="4dp"
-                                android:text="@string/unt_mis_col"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold" />
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:orientation="horizontal">
-
-
-                            <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:layout_marginStart="4dp"
-                                android:text="("
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="0dp"
-                                android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaAvailable)}"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold" />
-
-                            <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:layout_marginStart="2dp"
-                                android:text="@{viewmodel.mtbAart.untMis}"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold" />
-
-                            <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:layout_marginStart="0dp"
-                                android:text=")"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold" />
-
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
-                    android:background="@color/gray_400" />
-
-
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:orientation="horizontal"
-                    android:weightSum="2">
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/input_partita_mag_layout"
-                        style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? 1f : 2f}"
-                        android:enabled="@{view.enabledChangePartitaMag}"
-                        android:paddingEnd="4dp"
-                        android:visibility="@{viewmodel.canPartitaMagBeChanged() || viewmodel.partitaMag != null ? View.VISIBLE : View.GONE}"
-                        tools:layout_weight="1">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/input_partita_mag_text"
-                            style="@style/TextInputEditText.OutlinePrimary"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/batch_lot"
-                            android:imeOptions="actionDone"
-                            android:inputType="text"
-                            app:binding="@{view.currentPartitaMag}" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/input_data_scad_layout"
-                        style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:enabled="@{view.enabledChangePartitaMag}"
-                        android:visibility="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? View.VISIBLE : View.GONE}">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/input_data_scad_text"
-                            style="@style/TextInputEditText.OutlinePrimary"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:focusableInTouchMode="false"
-                            android:hint="@string/expire_date"
-                            android:inputType="text"
-                            app:binding="@{view.currentDataScad}"
-                            app:parentView="@{view}"
-                            app:warningOnOldDates="@{true}" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:orientation="horizontal"
-                    android:weightSum="3">
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/input_num_cnf_layout"
-                        style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
-                        android:enabled="@{view.enabledNumCnf}"
-                        android:focusableInTouchMode="false"
-                        android:paddingEnd="4dp"
-                        tools:layout_weight="1">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/input_num_cnf_text"
-                            style="@style/TextInputEditText.OutlinePrimary"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/num_pcks"
-                            android:imeOptions="actionDone"
-                            android:inputType="number"
-                            app:binding="@{view.currentNumCnf}" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/input_qta_cnf_layout"
-                        style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:enabled="@{view.enabledQtaCnf}"
-                        android:focusableInTouchMode="false"
-                        android:paddingEnd="4dp"
-                        android:visibility="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? View.VISIBLE : View.GONE}">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/input_qta_cnf_text"
-                            style="@style/TextInputEditText.OutlinePrimary"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/qty_x_pck"
-                            android:imeOptions="actionDone"
-                            android:inputType="numberDecimal"
-                            app:binding="@{view.currentQtaCnf}" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/input_qta_tot_layout"
-                        style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
-                        android:enabled="@{view.enabledQtaTot}"
-                        android:focusableInTouchMode="false"
-                        android:imeOptions="actionDone"
-                        tools:layout_weight="1">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            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:inputType="number"
-                            app:binding="@{view.currentQtaTot}" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:orientation="horizontal"
-                    android:visibility="@{viewmodel.mtbAart.isFlagQtaCnfFissaBoolean() ? View.GONE : View.VISIBLE}"
-                    android:weightSum="3">
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/input_tara_ped_layout"
-                        style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:enabled="false"
-                        android:focusableInTouchMode="false"
-                        android:paddingEnd="4dp"
-                        tools:layout_weight="1">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/input_tara_ped_text"
-                            style="@style/TextInputEditText.OutlinePrimary"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:enabled="false"
-                            android:hint="@string/tare_art"
-                            android:inputType="number"
-                            android:textColor="@color/gray_400"
-                            app:binding="@{view.currentTaraArticolo}" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/input_tara_col_layout"
-                        style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:enabled="false"
-                        android:focusableInTouchMode="false"
-                        android:paddingEnd="4dp">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/input_tara_col_text"
-                            style="@style/TextInputEditText.OutlinePrimary"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:enabled="false"
-                            android:hint="@string/tare_pckg"
-                            android:imeOptions="actionDone"
-                            android:inputType="numberDecimal"
-                            android:textColor="@color/gray_400"
-                            app:binding="@{view.currentTaraTot}" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/input_peso_lordo_layout"
-                        style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:enabled="@{view.enabledPesoLordo}"
-                        android:focusableInTouchMode="false"
-                        android:imeOptions="actionDone"
-                        tools:layout_weight="1">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/input_peso_lordo_text"
-                            style="@style/TextInputEditText.OutlinePrimary"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/LU_weight"
-                            android:inputType="number"
-                            android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}"
-                            android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }"
-                            app:binding="@{view.currentPesoLordo}" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/input_note_layout"
-                        style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:enabled="@{view.enabledNotes}"
-                        android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/input_note_text"
-                            style="@style/TextInputEditText.OutlinePrimary"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/hint_additional_notes"
-                            android:inputType="textMultiLine"
-                            app:binding="@{view.currentNotes}" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_margin="16dp"
-                    android:gravity="center_horizontal"
-                    android:orientation="horizontal"
-                    android:weightSum="1">
+                    android:orientation="vertical">
 
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/close_lu_btn"
-                        style="@style/Button.PrimaryOutline"
-                        android:layout_width="0dp"
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Dialog.DialogTitleText"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="0dp"
-                        android:layout_marginEnd="4dp"
-                        android:layout_weight="0.4"
-                        android:onClick="@{() -> view.saveAndCloseLU()}"
-                        android:text="@string/action_close_ul"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:strokeColor="@color/colorPrimary"
-                        app:visibility="@{view.enabledLUCloseButton}" />
+                        android:ellipsize="end"
+                        android:text="@{viewmodel.mtbAart.codMart}"
+                        android:textColor="@color/colorPrimary"
+                        tools:text="COD MART (Partita mag)" />
 
 
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/abort_btn"
-                        style="@style/Button.DangerFull"
-                        android:layout_width="0dp"
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Dialog.DialogSubTitleText"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
-                        android:layout_marginEnd="4dp"
-                        android:layout_weight="0.3"
-                        android:onClick="@{() -> view.dismiss()}"
-                        android:paddingEnd="3dp"
-                        app:icon="@drawable/ic_close_24dp"
-                        app:iconGravity="textStart"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        android:ellipsize="end"
+                        android:text="@{viewmodel.mtbAart.diacod}"
+                        android:textColor="@color/red_600"
+                        android:visibility="@{UtilityString.isNullOrEmpty(viewmodel.mtbAart.diacod) ? View.GONE : View.VISIBLE}"
+                        tools:text="DIACOD" />
 
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/save_btn"
-                        style="@style/Button.PrimaryFull"
-                        android:layout_width="0dp"
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
-                        android:layout_marginEnd="0dp"
-                        android:layout_weight="0.3"
-                        android:onClick="@{() -> view.save()}"
-                        android:paddingEnd="3dp"
-                        app:icon="@drawable/ic_save_24"
-                        app:iconGravity="textStart"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        android:layout_marginTop="4dp"
+                        android:singleLine="false"
+                        android:text="@{viewmodel.mtbAart.descrizioneEstesa}"
+                        tools:text="RAD 25 D H/L 200 - 10 EL B BIANCO" />
+
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:visibility="@{viewmodel.totalNumCnfOrd != null || viewmodel.totalQtaOrd != null ? View.VISIBLE : View.GONE}">
+
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_toStartOf="@id/qta_ord_panel"
+                            android:text="@string/total_ordered"
+                            android:textColor="@android:color/black" />
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:id="@+id/qta_ord_panel"
+                            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.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfOrd)}"
+                                android:textColor="@android:color/black"
+                                android:textStyle="bold" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_marginStart="4dp"
+                                android:text="@string/unt_mis_col"
+                                android:textColor="@android:color/black"
+                                android:textStyle="bold" />
+
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_marginStart="4dp"
+                                android:text="("
+                                android:textColor="@android:color/black"
+                                android:textStyle="bold" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="0dp"
+                                android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaOrd)}"
+                                android:textColor="@android:color/black"
+                                android:textStyle="bold" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_marginStart="2dp"
+                                android:text="@{viewmodel.mtbAart.untMis}"
+                                android:textColor="@android:color/black"
+                                android:textStyle="bold" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_marginStart="0dp"
+                                android:text=")"
+                                android:textColor="@android:color/black"
+                                android:textStyle="bold" />
+
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginTop="2dp"
+                        android:gravity="center"
+                        android:visibility="@{view.currentTextNumCnfToTake > 0 || view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}">
+
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:id="@+id/qta_ord_text_panel"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/badge_round_corner"
+                            android:backgroundTint="@color/light_blue_100"
+                            android:gravity="center"
+                            android:orientation="horizontal"
+                            android:paddingHorizontal="12dp"
+                            android:paddingVertical="4dp">
+
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:layout_width="20dp"
+                                android:layout_height="20dp"
+                                android:src="@drawable/ic_info_78dp"
+                                android:tint="@color/gray_600" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="4dp"
+                                android:text="@{view.currentTextNumCnfToTake.toString()}"
+                                android:textColor="@color/gray_600"
+                                android:textStyle="bold"
+                                android:visibility="@{view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}"
+                                tools:text="1" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_marginStart="4dp"
+                                android:text="@{@plurals/item_package(view.currentTextNumCnfToTake)}"
+                                android:textColor="@color/gray_600"
+                                android:textStyle="bold"
+                                android:visibility="@{view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}"
+                                tools:text="conf" />
+
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_marginStart="4dp"
+                                android:text="e"
+                                android:textColor="@color/gray_600"
+                                android:visibility="@{view.currentTextNumPezziToTake > 0 &amp;&amp; view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="4dp"
+                                android:text="@{view.currentTextNumPezziToTake.toString()}"
+                                android:textColor="@color/gray_600"
+                                android:textStyle="bold"
+                                android:visibility="@{view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}"
+                                tools:text="4" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_marginStart="2dp"
+                                android:text="@{@plurals/pieces(view.currentTextNumPezziToTake)}"
+                                android:textAllCaps="false"
+                                android:textColor="@color/gray_600"
+                                android:textStyle="bold"
+                                android:visibility="@{view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}"
+                                tools:text="Pezzi" />
+
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    </RelativeLayout>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:gravity="center"
+                        android:orientation="horizontal"
+                        android:weightSum="1">
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_marginEnd="2dp"
+                            android:layout_weight="0.5"
+                            android:background="@drawable/badge_round_corner"
+                            android:backgroundTint="@color/green_600"
+                            android:orientation="vertical"
+                            android:padding="8dp"
+                            android:visibility="@{viewmodel.totalNumCnfToBeTaken != null || viewmodel.totalQtaToBeTaken != null ? View.VISIBLE : View.GONE}">
+
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="@string/to_be_taken"
+                                android:textColor="@android:color/white" />
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal">
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfToBeTaken)}"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="4dp"
+                                    android:text="@string/unt_mis_col"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold" />
+
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal">
+
+
+                                <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:layout_marginStart="4dp"
+                                    android:text="("
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="0dp"
+                                    android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaToBeTaken)}"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold" />
+
+                                <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:layout_marginStart="2dp"
+                                    android:text="@{viewmodel.mtbAart.untMis}"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold" />
+
+                                <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:layout_marginStart="0dp"
+                                    android:text=")"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_marginStart="2dp"
+                            android:layout_weight="0.5"
+                            android:background="@drawable/badge_round_corner"
+                            android:backgroundTint="@color/colorPrimary"
+                            android:orientation="vertical"
+                            android:padding="8dp"
+                            android:visibility="@{viewmodel.totalNumCnfAvailable != null || viewmodel.totalQtaAvailable != null ? View.VISIBLE : View.GONE}">
+
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="@string/total_available"
+                                android:textColor="@android:color/white" />
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal">
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfAvailable)}"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="4dp"
+                                    android:text="@string/unt_mis_col"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal">
+
+
+                                <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:layout_marginStart="4dp"
+                                    android:text="("
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="0dp"
+                                    android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaAvailable)}"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold" />
+
+                                <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:layout_marginStart="2dp"
+                                    android:text="@{viewmodel.mtbAart.untMis}"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold" />
+
+                                <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:layout_marginStart="0dp"
+                                    android:text=")"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold" />
+
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:background="@color/gray_400" />
+
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal"
+                        android:weightSum="2">
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/input_partita_mag_layout"
+                            style="@style/TextInputLayout.OutlinePrimary"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? 1f : 2f}"
+                            android:enabled="@{view.enabledChangePartitaMag}"
+                            android:paddingEnd="4dp"
+                            android:visibility="@{viewmodel.canPartitaMagBeChanged() || viewmodel.partitaMag != null ? View.VISIBLE : View.GONE}"
+                            tools:layout_weight="1">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/input_partita_mag_text"
+                                style="@style/TextInputEditText.OutlinePrimary"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:hint="@string/batch_lot"
+                                android:imeOptions="actionDone"
+                                android:inputType="text"
+                                app:binding="@{view.currentPartitaMag}" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/input_data_scad_layout"
+                            style="@style/TextInputLayout.OutlinePrimary"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:enabled="@{view.enabledChangePartitaMag}"
+                            android:visibility="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? View.VISIBLE : View.GONE}">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/input_data_scad_text"
+                                style="@style/TextInputEditText.OutlinePrimary"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:focusableInTouchMode="false"
+                                android:hint="@string/expire_date"
+                                android:inputType="text"
+                                app:binding="@{view.currentDataScad}"
+                                app:parentView="@{view}"
+                                app:warningOnOldDates="@{true}" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal"
+                        android:weightSum="3">
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/input_num_cnf_layout"
+                            style="@style/TextInputLayout.OutlinePrimary"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
+                            android:enabled="@{view.enabledNumCnf}"
+                            android:focusableInTouchMode="false"
+                            android:paddingEnd="4dp"
+                            tools:layout_weight="1">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/input_num_cnf_text"
+                                style="@style/TextInputEditText.OutlinePrimary"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:hint="@string/num_pcks"
+                                android:imeOptions="actionDone"
+                                android:inputType="number"
+                                app:binding="@{view.currentNumCnf}" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/input_qta_cnf_layout"
+                            style="@style/TextInputLayout.OutlinePrimary"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:enabled="@{view.enabledQtaCnf}"
+                            android:focusableInTouchMode="false"
+                            android:paddingEnd="4dp"
+                            android:visibility="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? View.VISIBLE : View.GONE}">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/input_qta_cnf_text"
+                                style="@style/TextInputEditText.OutlinePrimary"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:hint="@string/qty_x_pck"
+                                android:imeOptions="actionDone"
+                                android:inputType="numberDecimal"
+                                app:binding="@{view.currentQtaCnf}" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/input_qta_tot_layout"
+                            style="@style/TextInputLayout.OutlinePrimary"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
+                            android:enabled="@{view.enabledQtaTot}"
+                            android:focusableInTouchMode="false"
+                            android:imeOptions="actionDone"
+                            tools:layout_weight="1">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                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:inputType="number"
+                                app:binding="@{view.currentQtaTot}" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal"
+                        android:visibility="@{viewmodel.mtbAart.isFlagQtaCnfFissaBoolean() ? View.GONE : View.VISIBLE}"
+                        android:weightSum="3">
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/input_tara_ped_layout"
+                            style="@style/TextInputLayout.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:enabled="false"
+                            android:focusableInTouchMode="false"
+                            android:paddingEnd="4dp"
+                            tools:layout_weight="1">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/input_tara_ped_text"
+                                style="@style/TextInputEditText.OutlinePrimary"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:enabled="false"
+                                android:hint="@string/tare_art"
+                                android:inputType="number"
+                                android:textColor="@color/gray_400"
+                                app:binding="@{view.currentTaraArticolo}" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/input_tara_col_layout"
+                            style="@style/TextInputLayout.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:enabled="false"
+                            android:focusableInTouchMode="false"
+                            android:paddingEnd="4dp">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/input_tara_col_text"
+                                style="@style/TextInputEditText.OutlinePrimary"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:enabled="false"
+                                android:hint="@string/tare_pckg"
+                                android:imeOptions="actionDone"
+                                android:inputType="numberDecimal"
+                                android:textColor="@color/gray_400"
+                                app:binding="@{view.currentTaraTot}" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/input_peso_lordo_layout"
+                            style="@style/TextInputLayout.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:enabled="@{view.enabledPesoLordo}"
+                            android:focusableInTouchMode="false"
+                            android:imeOptions="actionDone"
+                            tools:layout_weight="1">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/input_peso_lordo_text"
+                                style="@style/TextInputEditText.OutlinePrimary"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:hint="@string/LU_weight"
+                                android:inputType="number"
+                                android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}"
+                                android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }"
+                                app:binding="@{view.currentPesoLordo}" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal">
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/input_note_layout"
+                            style="@style/TextInputLayout.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:enabled="@{view.enabledNotes}"
+                            android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/input_note_text"
+                                style="@style/TextInputEditText.OutlinePrimary"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:hint="@string/hint_additional_notes"
+                                android:inputType="textMultiLine"
+                                app:binding="@{view.currentNotes}" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="16dp"
+                        android:gravity="center_horizontal"
+                        android:orientation="horizontal"
+                        android:weightSum="1">
+
+                        <com.google.android.material.button.MaterialButton
+                            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:onClick="@{() -> view.saveAndCloseLU()}"
+                            android:text="@string/action_close_ul"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:strokeColor="@color/colorPrimary"
+                            app:visibility="@{view.enabledLUCloseButton}" />
+
+
+                        <com.google.android.material.button.MaterialButton
+                            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:onClick="@{() -> view.dismiss()}"
+                            android:paddingEnd="3dp"
+                            app:icon="@drawable/ic_close_24dp"
+                            app:iconGravity="textStart"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+
+                        <com.google.android.material.button.MaterialButton
+                            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:onClick="@{() -> view.save()}"
+                            android:paddingEnd="3dp"
+                            app:icon="@drawable/ic_save_24"
+                            app:iconGravity="textStart"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
+            </ScrollView>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
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 6f0683a7..312fb1f0 100644
--- a/app/src/main/res/layout/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml
@@ -48,765 +48,770 @@
         </androidx.appcompat.widget.Toolbar>
 
 
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="0dp"
+        <ScrollView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:layout_marginTop="8dp"
-            android:orientation="vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/toolbar">
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp">
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Dialog.DialogTitleText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_toStartOf="@id/unt_mis"
-                    android:ellipsize="end"
-                    android:text="@{viewmodel.mtbAart.codMart}"
-                    android:textColor="@color/colorPrimary"
-                    tools:text="COD MART (Partita mag)" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/unt_mis"
-                    style="@style/AppTheme.NewMaterial.Dialog.DialogTitleText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:ellipsize="end"
-                    android:text="@{viewmodel.mtbAart.untMis}"
-                    android:textColor="@color/colorPrimary"
-                    android:visibility="@{viewmodel.mtbAart.untMis != null ? View.VISIBLE : View.GONE}"
-                    tools:text="UM" />
-
-            </RelativeLayout>
-
-
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Dialog.DialogSubTitleText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:text="@{viewmodel.mtbAart.diacod}"
-                android:textColor="@color/red_600"
-                android:visibility="@{UtilityString.isNullOrEmpty(viewmodel.mtbAart.diacod) ? View.GONE : View.VISIBLE}"
-                tools:text="DIACOD" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:singleLine="false"
-                android:text="@{viewmodel.mtbAart.descrizioneEstesa}"
-                tools:text="RAD 25 D H/L 200 - 10 EL B BIANCO" />
-
-
-            <RelativeLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_margin="8dp"
                 android:layout_marginTop="8dp"
-                android:visibility="@{viewmodel.totalNumCnfOrd != null || viewmodel.totalQtaOrd != null ? View.VISIBLE : View.GONE}">
+                android:orientation="vertical">
 
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_toStartOf="@id/qta_ord_panel"
-                    android:text="@string/total_ordered"
-                    android:textColor="@android:color/black" />
-
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:id="@+id/qta_ord_panel"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:orientation="horizontal">
+                    android:layout_marginTop="8dp">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/AppTheme.NewMaterial.Dialog.DialogTitleText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfOrd)}"
-                        android:textColor="@android:color/black"
-                        android:textStyle="bold" />
+                        android:layout_alignParentStart="true"
+                        android:layout_toStartOf="@id/unt_mis"
+                        android:ellipsize="end"
+                        android:text="@{viewmodel.mtbAart.codMart}"
+                        android:textColor="@color/colorPrimary"
+                        tools:text="COD MART (Partita mag)" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        android:id="@+id/unt_mis"
+                        style="@style/AppTheme.NewMaterial.Dialog.DialogTitleText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
-                        android:layout_marginStart="4dp"
-                        android:text="@string/unt_mis_col"
-                        android:textColor="@android:color/black"
-                        android:textStyle="bold" />
-
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginStart="4dp"
-                        android:text="("
-                        android:textColor="@android:color/black"
-                        android:textStyle="bold" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="0dp"
-                        android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaOrd)}"
-                        android:textColor="@android:color/black"
-                        android:textStyle="bold" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginStart="2dp"
+                        android:ellipsize="end"
                         android:text="@{viewmodel.mtbAart.untMis}"
-                        android:textColor="@android:color/black"
-                        android:textStyle="bold" />
+                        android:textColor="@color/colorPrimary"
+                        android:visibility="@{viewmodel.mtbAart.untMis != null ? View.VISIBLE : View.GONE}"
+                        tools:text="UM" />
+
+                </RelativeLayout>
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Dialog.DialogSubTitleText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:text="@{viewmodel.mtbAart.diacod}"
+                    android:textColor="@color/red_600"
+                    android:visibility="@{UtilityString.isNullOrEmpty(viewmodel.mtbAart.diacod) ? View.GONE : View.VISIBLE}"
+                    tools:text="DIACOD" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:singleLine="false"
+                    android:text="@{viewmodel.mtbAart.descrizioneEstesa}"
+                    tools:text="RAD 25 D H/L 200 - 10 EL B BIANCO" />
+
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:visibility="@{viewmodel.totalNumCnfOrd != null || viewmodel.totalQtaOrd != null ? View.VISIBLE : View.GONE}">
+
 
                     <androidx.appcompat.widget.AppCompatTextView
                         style="@style/AppTheme.NewMaterial.Text.Medium"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_toStartOf="@id/qta_ord_panel"
+                        android:text="@string/total_ordered"
+                        android:textColor="@android:color/black" />
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/qta_ord_panel"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
-                        android:layout_marginStart="0dp"
-                        android:text=")"
-                        android:textColor="@android:color/black"
-                        android:textStyle="bold" />
+                        android:orientation="horizontal">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfOrd)}"
+                            android:textColor="@android:color/black"
+                            android:textStyle="bold" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginStart="4dp"
+                            android:text="@string/unt_mis_col"
+                            android:textColor="@android:color/black"
+                            android:textStyle="bold" />
 
 
-                </androidx.appcompat.widget.LinearLayoutCompat>
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginStart="4dp"
+                            android:text="("
+                            android:textColor="@android:color/black"
+                            android:textStyle="bold" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="0dp"
+                            android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaOrd)}"
+                            android:textColor="@android:color/black"
+                            android:textStyle="bold" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginStart="2dp"
+                            android:text="@{viewmodel.mtbAart.untMis}"
+                            android:textColor="@android:color/black"
+                            android:textStyle="bold" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginStart="0dp"
+                            android:text=")"
+                            android:textColor="@android:color/black"
+                            android:textStyle="bold" />
 
 
-            </RelativeLayout>
+                    </androidx.appcompat.widget.LinearLayoutCompat>
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="2dp"
-                android:gravity="center"
-                android:visibility="@{view.currentTextNumCnfToTake > 0 || view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}">
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="2dp"
+                    android:gravity="center"
+                    android:visibility="@{view.currentTextNumCnfToTake > 0 || view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}">
+
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/qta_ord_text_panel"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/badge_round_corner"
+                        android:backgroundTint="@color/light_blue_100"
+                        android:gravity="center"
+                        android:orientation="horizontal"
+                        android:paddingHorizontal="12dp"
+                        android:paddingVertical="4dp">
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:src="@drawable/ic_info_78dp"
+                            android:tint="@color/gray_600" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="4dp"
+                            android:text="@{view.currentTextNumCnfToTake.toString()}"
+                            android:textColor="@color/gray_600"
+                            android:textStyle="bold"
+                            android:visibility="@{view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}"
+                            tools:text="1" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginStart="4dp"
+                            android:text="@{@plurals/item_package(view.currentTextNumCnfToTake)}"
+                            android:textColor="@color/gray_600"
+                            android:textStyle="bold"
+                            android:visibility="@{view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}"
+                            tools:text="conf" />
+
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginStart="4dp"
+                            android:text="e"
+                            android:textColor="@color/gray_600"
+                            android:visibility="@{view.currentTextNumPezziToTake > 0 &amp;&amp; view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="4dp"
+                            android:text="@{view.currentTextNumPezziToTake.toString()}"
+                            android:textColor="@color/gray_600"
+                            android:textStyle="bold"
+                            android:visibility="@{view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}"
+                            tools:text="4" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginStart="2dp"
+                            android:text="@{@plurals/pieces(view.currentTextNumPezziToTake)}"
+                            android:textAllCaps="false"
+                            android:textColor="@color/gray_600"
+                            android:textStyle="bold"
+                            android:visibility="@{view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}"
+                            tools:text="Pezzi" />
+
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                </RelativeLayout>
 
 
                 <androidx.appcompat.widget.LinearLayoutCompat
-                    android:id="@+id/qta_ord_text_panel"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/badge_round_corner"
-                    android:backgroundTint="@color/light_blue_100"
+                    android:layout_marginTop="8dp"
                     android:gravity="center"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="12dp"
-                    android:paddingVertical="4dp">
+                    android:weightSum="1">
 
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:src="@drawable/ic_info_78dp"
-                        android:tint="@color/gray_600" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:layout_width="wrap_content"
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
-                        android:text="@{view.currentTextNumCnfToTake.toString()}"
-                        android:textColor="@color/gray_600"
-                        android:textStyle="bold"
-                        android:visibility="@{view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}"
-                        tools:text="1" />
+                        android:layout_gravity="center"
+                        android:layout_marginEnd="2dp"
+                        android:layout_weight="0.5"
+                        android:background="@drawable/badge_round_corner"
+                        android:backgroundTint="@color/green_600"
+                        android:orientation="vertical"
+                        android:padding="8dp"
+                        android:visibility="@{viewmodel.totalNumCnfToBeTaken != null || viewmodel.totalQtaToBeTaken != null ? View.VISIBLE : View.GONE}">
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:layout_width="wrap_content"
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:text="@string/to_be_taken"
+                            android:textColor="@android:color/white" />
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:orientation="horizontal">
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfToBeTaken)}"
+                                android:textColor="@android:color/white"
+                                android:textStyle="bold" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_marginStart="4dp"
+                                android:text="@string/unt_mis_col"
+                                android:textColor="@android:color/white"
+                                android:textStyle="bold" />
+
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:orientation="horizontal">
+
+
+                            <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:layout_marginStart="4dp"
+                                android:text="("
+                                android:textColor="@android:color/white"
+                                android:textStyle="bold" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Small"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="0dp"
+                                android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaToBeTaken)}"
+                                android:textColor="@android:color/white"
+                                android:textStyle="bold" />
+
+                            <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:layout_marginStart="2dp"
+                                android:text="@{viewmodel.mtbAart.untMis}"
+                                android:textColor="@android:color/white"
+                                android:textStyle="bold" />
+
+                            <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:layout_marginStart="0dp"
+                                android:text=")"
+                                android:textColor="@android:color/white"
+                                android:textStyle="bold" />
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginStart="4dp"
-                        android:text="@{@plurals/item_package(view.currentTextNumCnfToTake)}"
-                        android:textColor="@color/gray_600"
-                        android:textStyle="bold"
-                        android:visibility="@{view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}"
-                        tools:text="conf" />
-
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginStart="4dp"
-                        android:text="e"
-                        android:textColor="@color/gray_600"
-                        android:visibility="@{view.currentTextNumPezziToTake > 0 &amp;&amp; view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
-                        android:text="@{view.currentTextNumPezziToTake.toString()}"
-                        android:textColor="@color/gray_600"
-                        android:textStyle="bold"
-                        android:visibility="@{view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}"
-                        tools:text="4" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
+                        android:layout_gravity="center"
                         android:layout_marginStart="2dp"
-                        android:text="@{@plurals/pieces(view.currentTextNumPezziToTake)}"
-                        android:textAllCaps="false"
-                        android:textColor="@color/gray_600"
-                        android:textStyle="bold"
-                        android:visibility="@{view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}"
-                        tools:text="Pezzi" />
+                        android:layout_weight="0.5"
+                        android:background="@drawable/badge_round_corner"
+                        android:backgroundTint="@color/colorPrimary"
+                        android:orientation="vertical"
+                        android:padding="8dp"
+                        android:visibility="@{viewmodel.totalNumCnfAvailable != null || viewmodel.totalQtaAvailable != null ? View.VISIBLE : View.GONE}">
+
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:text="@string/total_available"
+                            android:textColor="@android:color/white" />
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:orientation="horizontal">
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfAvailable)}"
+                                android:textColor="@android:color/white"
+                                android:textStyle="bold" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_marginStart="4dp"
+                                android:text="@string/unt_mis_col"
+                                android:textColor="@android:color/white"
+                                android:textStyle="bold" />
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:orientation="horizontal">
+
+
+                            <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:layout_marginStart="4dp"
+                                android:text="("
+                                android:textColor="@android:color/white"
+                                android:textStyle="bold" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Small"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="0dp"
+                                android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaAvailable)}"
+                                android:textColor="@android:color/white"
+                                android:textStyle="bold" />
+
+                            <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:layout_marginStart="2dp"
+                                android:text="@{viewmodel.mtbAart.untMis}"
+                                android:textColor="@android:color/white"
+                                android:textStyle="bold" />
+
+                            <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:layout_marginStart="0dp"
+                                android:text=")"
+                                android:textColor="@android:color/white"
+                                android:textStyle="bold" />
+
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
 
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
-            </RelativeLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@color/gray_400" />
 
 
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:weightSum="1">
-
                 <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginEnd="2dp"
-                    android:layout_weight="0.5"
-                    android:background="@drawable/badge_round_corner"
-                    android:backgroundTint="@color/green_600"
-                    android:orientation="vertical"
-                    android:padding="8dp"
-                    android:visibility="@{viewmodel.totalNumCnfToBeTaken != null || viewmodel.totalQtaToBeTaken != null ? View.VISIBLE : View.GONE}">
+                    android:layout_marginTop="8dp"
+                    android:orientation="horizontal"
+                    android:weightSum="2">
 
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_partita_mag_layout"
+                        style="@style/TextInputLayout.OutlinePrimary"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="@string/to_be_taken"
-                        android:textColor="@android:color/white" />
+                        android:layout_weight="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? 1f : 2f}"
+                        android:enabled="@{view.enabledChangePartitaMag}"
+                        android:paddingEnd="4dp"
+                        android:visibility="@{viewmodel.canPartitaMagBeChanged() || viewmodel.partitaMag != null ? View.VISIBLE : View.GONE}"
+                        tools:layout_weight="1">
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:layout_width="wrap_content"
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_partita_mag_text"
+                            style="@style/TextInputEditText.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/batch_lot"
+                            android:imeOptions="actionDone"
+                            android:inputType="text"
+                            app:binding="@{view.currentPartitaMag}" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_data_scad_layout"
+                        style="@style/TextInputLayout.OutlinePrimary"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:orientation="horizontal">
+                        android:layout_weight="1"
+                        android:enabled="@{view.enabledChangePartitaMag}"
+                        android:visibility="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? View.VISIBLE : View.GONE}">
 
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_data_scad_text"
+                            style="@style/TextInputEditText.OutlinePrimary"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfToBeTaken)}"
-                            android:textColor="@android:color/white"
-                            android:textStyle="bold" />
+                            android:focusableInTouchMode="false"
+                            android:hint="@string/expire_date"
+                            android:inputType="text"
+                            app:binding="@{view.currentDataScad}"
+                            app:parentView="@{view}"
+                            app:warningOnOldDates="@{true}" />
 
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_marginStart="4dp"
-                            android:text="@string/unt_mis_col"
-                            android:textColor="@android:color/white"
-                            android:textStyle="bold" />
-
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:orientation="horizontal">
-
-
-                        <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:layout_marginStart="4dp"
-                            android:text="("
-                            android:textColor="@android:color/white"
-                            android:textStyle="bold" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="0dp"
-                            android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaToBeTaken)}"
-                            android:textColor="@android:color/white"
-                            android:textStyle="bold" />
-
-                        <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:layout_marginStart="2dp"
-                            android:text="@{viewmodel.mtbAart.untMis}"
-                            android:textColor="@android:color/white"
-                            android:textStyle="bold" />
-
-                        <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:layout_marginStart="0dp"
-                            android:text=")"
-                            android:textColor="@android:color/white"
-                            android:textStyle="bold" />
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
+                    </com.google.android.material.textfield.TextInputLayout>
 
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="2dp"
-                    android:layout_weight="0.5"
-                    android:background="@drawable/badge_round_corner"
-                    android:backgroundTint="@color/colorPrimary"
-                    android:orientation="vertical"
-                    android:padding="8dp"
-                    android:visibility="@{viewmodel.totalNumCnfAvailable != null || viewmodel.totalQtaAvailable != null ? View.VISIBLE : View.GONE}">
+                    android:layout_marginTop="8dp"
+                    android:orientation="horizontal"
+                    android:weightSum="3">
 
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="@string/total_available"
-                        android:textColor="@android:color/white" />
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:orientation="horizontal">
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfAvailable)}"
-                            android:textColor="@android:color/white"
-                            android:textStyle="bold" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_marginStart="4dp"
-                            android:text="@string/unt_mis_col"
-                            android:textColor="@android:color/white"
-                            android:textStyle="bold" />
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:orientation="horizontal">
-
-
-                        <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:layout_marginStart="4dp"
-                            android:text="("
-                            android:textColor="@android:color/white"
-                            android:textStyle="bold" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="0dp"
-                            android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaAvailable)}"
-                            android:textColor="@android:color/white"
-                            android:textStyle="bold" />
-
-                        <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:layout_marginStart="2dp"
-                            android:text="@{viewmodel.mtbAart.untMis}"
-                            android:textColor="@android:color/white"
-                            android:textStyle="bold" />
-
-                        <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:layout_marginStart="0dp"
-                            android:text=")"
-                            android:textColor="@android:color/white"
-                            android:textStyle="bold" />
-
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:background="@color/gray_400" />
-
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:orientation="horizontal"
-                android:weightSum="2">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/input_partita_mag_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? 1f : 2f}"
-                    android:enabled="@{view.enabledChangePartitaMag}"
-                    android:paddingEnd="4dp"
-                    android:visibility="@{viewmodel.canPartitaMagBeChanged() || viewmodel.partitaMag != null ? View.VISIBLE : View.GONE}"
-                    tools:layout_weight="1">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/input_partita_mag_text"
-                        style="@style/TextInputEditText.OutlinePrimary"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/batch_lot"
-                        android:imeOptions="actionDone"
-                        android:inputType="text"
-                        app:binding="@{view.currentPartitaMag}" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/input_data_scad_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:enabled="@{view.enabledChangePartitaMag}"
-                    android:visibility="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? View.VISIBLE : View.GONE}">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/input_data_scad_text"
-                        style="@style/TextInputEditText.OutlinePrimary"
-                        android:layout_width="match_parent"
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_num_cnf_layout"
+                        style="@style/TextInputLayout.OutlinePrimary"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
+                        android:enabled="@{view.enabledNumCnf}"
                         android:focusableInTouchMode="false"
-                        android:hint="@string/expire_date"
-                        android:inputType="text"
-                        app:binding="@{view.currentDataScad}"
-                        app:parentView="@{view}"
-                        app:warningOnOldDates="@{true}" />
+                        android:paddingEnd="4dp"
+                        tools:layout_weight="1">
 
-                </com.google.android.material.textfield.TextInputLayout>
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_num_cnf_text"
+                            style="@style/TextInputEditText.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/num_pcks"
+                            android:imeOptions="actionDone"
+                            android:inputType="number"
+                            android:nextFocusForward="@+id/input_qta_cnf_text"
+                            android:selectAllOnFocus="true"
+                            app:binding="@{view.currentNumCnf}" />
 
+                    </com.google.android.material.textfield.TextInputLayout>
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:orientation="horizontal"
-                android:weightSum="3">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/input_num_cnf_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
-                    android:enabled="@{view.enabledNumCnf}"
-                    android:focusableInTouchMode="false"
-                    android:paddingEnd="4dp"
-                    tools:layout_weight="1">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/input_num_cnf_text"
-                        style="@style/TextInputEditText.OutlinePrimary"
-                        android:layout_width="match_parent"
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_qta_cnf_layout"
+                        style="@style/TextInputLayout.OutlinePrimary"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:hint="@string/num_pcks"
+                        android:layout_weight="1"
+                        android:enabled="@{view.enabledQtaCnf}"
+                        android:focusableInTouchMode="false"
+                        android:paddingEnd="4dp"
+                        android:visibility="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? View.VISIBLE : View.GONE}">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_qta_cnf_text"
+                            style="@style/TextInputEditText.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/qty_x_pck"
+                            android:imeOptions="actionDone"
+                            android:inputType="numberDecimal"
+                            android:nextFocusForward="@+id/input_qta_tot_text"
+                            android:selectAllOnFocus="true"
+                            app:binding="@{view.currentQtaCnf}" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_qta_tot_layout"
+                        style="@style/TextInputLayout.OutlinePrimary"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
+                        android:enabled="@{view.enabledQtaTot}"
+                        android:focusableInTouchMode="false"
                         android:imeOptions="actionDone"
-                        android:inputType="number"
-                        android:nextFocusForward="@+id/input_qta_cnf_text"
-                        android:selectAllOnFocus="true"
-                        app:binding="@{view.currentNumCnf}" />
+                        tools:layout_weight="1">
 
-                </com.google.android.material.textfield.TextInputLayout>
+                        <com.google.android.material.textfield.TextInputEditText
+                            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:inputType="number"
+                            android:selectAllOnFocus="true"
+                            app:binding="@{view.currentQtaTot}" />
 
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/input_qta_cnf_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:enabled="@{view.enabledQtaCnf}"
-                    android:focusableInTouchMode="false"
-                    android:paddingEnd="4dp"
-                    android:visibility="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? View.VISIBLE : View.GONE}">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/input_qta_cnf_text"
-                        style="@style/TextInputEditText.OutlinePrimary"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/qty_x_pck"
-                        android:imeOptions="actionDone"
-                        android:inputType="numberDecimal"
-                        android:nextFocusForward="@+id/input_qta_tot_text"
-                        android:selectAllOnFocus="true"
-                        app:binding="@{view.currentQtaCnf}" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/input_qta_tot_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
-                    android:enabled="@{view.enabledQtaTot}"
-                    android:focusableInTouchMode="false"
-                    android:imeOptions="actionDone"
-                    tools:layout_weight="1">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        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:inputType="number"
-                        android:selectAllOnFocus="true"
-                        app:binding="@{view.currentQtaTot}" />
-
-                </com.google.android.material.textfield.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:orientation="horizontal"
-                android:visibility="@{viewmodel.mtbAart.isFlagQtaCnfFissaBoolean() ? View.GONE : View.VISIBLE}"
-                android:weightSum="3">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/input_tara_ped_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:enabled="false"
-                    android:focusableInTouchMode="false"
-                    android:paddingEnd="4dp"
-                    tools:layout_weight="1">
+                    android:layout_marginTop="8dp"
+                    android:orientation="horizontal"
+                    android:visibility="@{viewmodel.mtbAart.isFlagQtaCnfFissaBoolean() ? View.GONE : View.VISIBLE}"
+                    android:weightSum="3">
 
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/input_tara_ped_text"
-                        style="@style/TextInputEditText.OutlinePrimary"
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_tara_ped_layout"
+                        style="@style/TextInputLayout.OutlinePrimary"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:enabled="false"
-                        android:hint="@string/tare_art"
-                        android:inputType="number"
-                        android:textColor="@color/gray_400"
-                        app:binding="@{view.currentTaraArticolo}" />
+                        android:focusableInTouchMode="false"
+                        android:paddingEnd="4dp"
+                        tools:layout_weight="1">
 
-                </com.google.android.material.textfield.TextInputLayout>
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_tara_ped_text"
+                            style="@style/TextInputEditText.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:enabled="false"
+                            android:hint="@string/tare_art"
+                            android:inputType="number"
+                            android:textColor="@color/gray_400"
+                            app:binding="@{view.currentTaraArticolo}" />
 
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/input_tara_col_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:enabled="false"
-                    android:focusableInTouchMode="false"
-                    android:paddingEnd="4dp">
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/input_tara_col_text"
-                        style="@style/TextInputEditText.OutlinePrimary"
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_tara_col_layout"
+                        style="@style/TextInputLayout.OutlinePrimary"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:enabled="false"
-                        android:hint="@string/tare_pckg"
+                        android:focusableInTouchMode="false"
+                        android:paddingEnd="4dp">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_tara_col_text"
+                            style="@style/TextInputEditText.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:enabled="false"
+                            android:hint="@string/tare_pckg"
+                            android:imeOptions="actionDone"
+                            android:inputType="numberDecimal"
+                            android:textColor="@color/gray_400"
+                            app:binding="@{view.currentTaraTot}" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_peso_lordo_layout"
+                        style="@style/TextInputLayout.OutlinePrimary"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:enabled="@{view.enabledPesoLordo}"
+                        android:focusableInTouchMode="false"
                         android:imeOptions="actionDone"
-                        android:inputType="numberDecimal"
-                        android:textColor="@color/gray_400"
-                        app:binding="@{view.currentTaraTot}" />
+                        tools:enabled="false"
+                        tools:layout_weight="1">
 
-                </com.google.android.material.textfield.TextInputLayout>
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_peso_lordo_text"
+                            style="@style/TextInputEditText.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/LU_weight"
+                            android:inputType="number"
+                            android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}"
+                            app:binding="@{view.currentPesoLordo}" />
 
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/input_peso_lordo_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                    </com.google.android.material.textfield.TextInputLayout>
+
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:enabled="@{view.enabledPesoLordo}"
-                    android:focusableInTouchMode="false"
-                    android:imeOptions="actionDone"
-                    tools:enabled="false"
-                    tools:layout_weight="1">
+                    android:layout_marginTop="8dp"
+                    android:orientation="horizontal">
 
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/input_peso_lordo_text"
-                        style="@style/TextInputEditText.OutlinePrimary"
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/input_note_layout"
+                        style="@style/TextInputLayout.OutlinePrimary"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:hint="@string/LU_weight"
-                        android:inputType="number"
-                        android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}"
-                        app:binding="@{view.currentPesoLordo}" />
+                        android:enabled="@{view.enabledNotes}"
+                        android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }">
 
-                </com.google.android.material.textfield.TextInputLayout>
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/input_note_text"
+                            style="@style/TextInputEditText.OutlinePrimary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/hint_additional_notes"
+                            android:inputType="textMultiLine"
+                            app:binding="@{view.currentNotes}" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
 
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:orientation="horizontal">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/input_note_layout"
-                    style="@style/TextInputLayout.OutlinePrimary"
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:enabled="@{view.enabledNotes}"
-                    android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }">
+                    android:layout_margin="16dp"
+                    android:gravity="center_horizontal"
+                    android:orientation="horizontal"
+                    android:weightSum="1">
 
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/input_note_text"
-                        style="@style/TextInputEditText.OutlinePrimary"
-                        android:layout_width="match_parent"
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/close_lu_btn"
+                        style="@style/Button.PrimaryOutline"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:hint="@string/hint_additional_notes"
-                        android:inputType="textMultiLine"
-                        app:binding="@{view.currentNotes}" />
+                        android:layout_marginStart="0dp"
+                        android:layout_marginEnd="4dp"
+                        android:layout_weight="0.4"
+                        android:onClick="@{() -> view.saveAndCloseLU()}"
+                        android:text="@string/action_close_ul"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:strokeColor="@color/colorPrimary"
+                        app:visibility="@{view.enabledLUCloseButton}" />
 
-                </com.google.android.material.textfield.TextInputLayout>
 
+                    <com.google.android.material.button.MaterialButton
+                        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:onClick="@{() -> view.dismiss()}"
+                        android:paddingEnd="3dp"
+                        app:icon="@drawable/ic_close_24dp"
+                        app:iconGravity="textStart"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+
+                    <com.google.android.material.button.MaterialButton
+                        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:onClick="@{() -> view.save()}"
+                        android:paddingEnd="3dp"
+                        app:icon="@drawable/ic_save_24"
+                        app:iconGravity="textStart"
+                        app:layout_constraintTop_toTopOf="parent" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
             </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="16dp"
-                android:gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:weightSum="1">
-
-                <com.google.android.material.button.MaterialButton
-                    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:onClick="@{() -> view.saveAndCloseLU()}"
-                    android:text="@string/action_close_ul"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:strokeColor="@color/colorPrimary"
-                    app:visibility="@{view.enabledLUCloseButton}" />
-
-
-                <com.google.android.material.button.MaterialButton
-                    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:onClick="@{() -> view.dismiss()}"
-                    android:paddingEnd="3dp"
-                    app:icon="@drawable/ic_close_24dp"
-                    app:iconGravity="textStart"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-
-                <com.google.android.material.button.MaterialButton
-                    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:onClick="@{() -> view.save()}"
-                    android:paddingEnd="3dp"
-                    app:icon="@drawable/ic_save_24"
-                    app:iconGravity="textStart"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        </ScrollView>
 
     </androidx.constraintlayout.widget.ConstraintLayout>