diff --git a/app/build.gradle b/app/build.gradle
index 249d20cd..90e67942 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 235
-    def appVersionName = '1.18.5'
+    def appVersionCode = 236
+    def appVersionName = '1.18.6'
 
     signingConfigs {
         release {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java
index 8b13a429..8e313b96 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java
@@ -56,6 +56,7 @@ public class MainContext {
     }
 
     public void logout(Runnable onLoggedOut) {
+        menuService.invalidateCache();
         UtilityThread.executeParallel(() -> {
             SettingsManager.i().setUser(null);
             SettingsManager.i().setUserSession(null);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/menu/MenuService.java b/app/src/main/java/it/integry/integrywmsnative/core/menu/MenuService.java
index bdc1f118..155e87d9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/menu/MenuService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/menu/MenuService.java
@@ -73,4 +73,9 @@ public class MenuService {
         }
     }
 
+    public void invalidateCache() {
+        this.mInternalCachedMenu = null;
+        this.mInternalCachedFlatMenu = null;
+    }
+
 }
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 dfb091da..a209e26d 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
@@ -521,7 +521,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:hint="@string/tot_qty"
-                            android:inputType="numberDecimal"
+                            android:digits="0123456789"
+                            android:inputType="number"
                             app:binding="@{view.currentQtaTot}" />
 
                     </com.google.android.material.textfield.TextInputLayout>
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 6d147a83..6f4ecbfb 100644
--- a/app/src/main/res/layout/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml
@@ -515,7 +515,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/tot_qty"
-                        android:inputType="numberDecimal"
+                        android:digits="0123456789"
+                        android:inputType="number"
                         app:binding="@{view.currentQtaTot}" />
 
                 </com.google.android.material.textfield.TextInputLayout>