diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
index c807a461..da6f1864 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
@@ -98,7 +98,9 @@ public class MainActivity extends AppCompatActivity
if (count == 0) {
super.onBackPressed();
} else {
- pop();
+ //pop();
+ getSupportFragmentManager().popBackStack();
+
}
}
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java
index 777be8ed..88f7b18e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java
@@ -61,6 +61,8 @@ public class VersamentoMerceViewModel {
mBinding = binding;
mHelper = helper;
mOnVersamentoCompleted = onVersamentoCompleted;
+
+ BarcodeManager.enable();
}
public void openLU() {
diff --git a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml
index 370f583e..a17a339c 100644
--- a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml
+++ b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml
@@ -27,15 +27,23 @@
android:paddingEnd="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
- android:gravity="center_vertical"
android:onClick="@{() -> checkableMtbColr.toggleCheck()}">
+
@@ -82,7 +90,7 @@
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:layout_alignParentEnd="true"
- android:gravity="center_vertical">
+ android:layout_centerVertical="true">