diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 47aa599c..c3df959b 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index 945ef389..5271c529 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,7 +83,7 @@ android {
         abortOnError false
     }
 
-    dynamicFeatures = [":dynamic__base"]
+    dynamicFeatures = [":dynamic_vgalimenti"]
 
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
index 0cf64998..d8c1d11d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
@@ -235,6 +235,7 @@ public class MainActivity extends AppCompatActivity
             if(addToBackStack) ft.addToBackStack(fragment.getTag());
 
             ft.commit();
+            fragmentManager.executePendingTransactions();
 
         }
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
index 0a080c34..8f3fb264 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
@@ -11,25 +11,15 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.preference.PreferenceFragmentCompat;
 import butterknife.ButterKnife;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.databinding.FragmentMainSettingsBinding;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 
-public class MainSettingsFragment extends Fragment implements ITitledFragment {
+public class MainSettingsFragment extends PreferenceFragmentCompat implements ITitledFragment {
 
-    private FragmentMainSettingsBinding mBinding;
 
-    public MainSettingsFragment() {
-        // Required empty public constructor
-    }
-
-    public static MainSettingsFragment newInstance() {
-        MainSettingsFragment fragment = new MainSettingsFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
-    }
 
     @Override
     public void onCreateActionBar(AppCompatTextView titleText, Context context) {
@@ -37,20 +27,8 @@ public class MainSettingsFragment extends Fragment implements ITitledFragment {
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-
-        mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_main_settings, container, false);
-
-        ButterKnife.bind(this, mBinding.getRoot());
-
-        return mBinding.getRoot();
-
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setPreferencesFromResource(R.xml.app_preferences, rootKey);
     }
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
index 35186e42..3b14cef7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
@@ -269,7 +269,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS
         mAdapter.updateItems(groupedOrdiniInevasi);
     }
 
-    RunnableArgs<OrdineVenditaGroupedInevasoDTO.Ordine> onSingleSelectionChanged = dto -> {
+    private RunnableArgs<OrdineVenditaGroupedInevasoDTO.Ordine> onSingleSelectionChanged = dto -> {
         List<OrdineVenditaGroupedInevasoDTO> selectedOrders = mHelper.getSelectedOrders(groupedOrdiniInevasi);
 
         if(!SettingsManager.iDB().isFlagMultiClienteOrdV()){
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
index 2a46c6d0..7de9ea3f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
@@ -634,6 +634,10 @@ public class DialogInputQuantity {
 
         } else {
 
+            if(quantityDTO.batchLot != null && !quantityDTO.batchLot.isEmpty()) {
+                quantityDTO.batchLot.set(quantityDTO.batchLot.get().toUpperCase());
+            }
+
             dialogCallback.onResult(quantityDTO);
             currentAlert.dismiss();
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4b54e6c3..19361543 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -184,4 +184,9 @@
     <string name="recovering_data">Recupero dati</string>
     <string name="wait_a_moment">Attendi qualche istante</string>
 
+
+
+    <string name="check_in_printer">Stampante Accettazione</string>
+    <string name="check_out_printer">Stampante Vendita</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 22962968..612ad49d 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -14,4 +14,9 @@
         <item>@color/green_500</item> <!-- Accettazione -->
     </array>
 
+    <array name="printerTypes">
+        <item>Primary</item>
+        <item>Secondary</item>
+    </array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd6dccd0..aa7803ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -188,4 +188,9 @@
     <string name="title_dynamic_vgalimenti">VGAlimenti customization</string>
     <string name="title_dynamic__base">Base customization</string>
 
+
+
+    <string name="check_in_printer">Check In printer</string>
+    <string name="check_out_printer">Check Out printer</string>
+
 </resources>
diff --git a/app/src/main/res/xml/app_preferences.xml b/app/src/main/res/xml/app_preferences.xml
index fcf353ac..9444647f 100644
--- a/app/src/main/res/xml/app_preferences.xml
+++ b/app/src/main/res/xml/app_preferences.xml
@@ -1,27 +1,30 @@
 <androidx.preference.PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <androidx.preference.PreferenceCategory
-        android:title="@string/general_settings">
+    <SwitchPreferenceCompat
+        app:key="notifications"
+        app:title="Enable message notifications"/>
 
-        <android.support.v7.preference.SwitchPreferenceCompat
-            android:key="key1"
-            android:title="Switch Preference"
-            android:summary="Switch Summary"
-            android:defaultValue="true" />
+    <Preference
+        app:key="feedback"
+        app:title="Send feedback"
+        app:summary="Report technical issues or suggest new features"/>
 
-        <android.support.v7.preference.EditTextPreference
-            android:key="key2"
-            android:title="EditText Preference"
-            android:summary="EditText Summary"
-            android:dialogMessage="Dialog Message"
-            android:defaultValue="Default value" />
 
-        <android.support.v7.preference.CheckBoxPreference
-            android:key="key3"
-            android:title="CheckBox Preference"
-            android:summary="CheckBox Summary"
-            android:defaultValue="true"/>
-    </androidx.preference.PreferenceCategory>
+    <ListPreference
+        app:key="check_in_printer"
+        app:title="@string/check_in_printer"
+        app:summary="%s"
+        app:entries="@array/printerTypes"
+        app:entryValues="@array/printerTypes"
+        app:defaultValue="0" />
+
+    <ListPreference
+        app:key="check_out_printer"
+        app:title="@string/check_out_printer"
+        app:summary="%s"
+        app:entries="@array/printerTypes"
+        app:entryValues="@array/printerTypes"
+        app:defaultValue="0" />
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt b/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
index 28cae7d8..95511285 100644
--- a/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
+++ b/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
@@ -310,6 +310,7 @@ open class WaterfallToolbar : androidx.cardview.widget.CardView {
             post {
                 // it's safe to use "!!" here, since savedState will
                 // always store values properly set in onSaveInstanceState()
+
                 cardElevation = state.elevation!!.toFloat()
                 orthodoxPosition = state.orthodoxPosition!!
                 realPosition = state.realPosition!!