diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 894b25ac..2d8d9e21 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index fc9d4646..bf2ef1a7 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -6,7 +6,7 @@
     <option name="DEPLOY_AS_INSTANT" value="false" />
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_ime,dynamic_vgalimenti" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic_frudis,dynamic_ime,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
diff --git a/app/build.gradle b/app/build.gradle
index a2592cd6..14ab6024 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 81
-    def appVersionName = '1.7.4'
+    def appVersionCode = 82
+    def appVersionName = '1.7.5'
 
     signingConfigs {
         release {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
index 6764563d..1277c9a5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
@@ -751,7 +751,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
         if(SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV()) {
             List<PickingObjectDTO> matchWithPartitaMag = Stream.of(matchPickingObject)
                     .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()) &&
-                            (pickData != null && Objects.equals(x.getPartitaMag(), pickData.getMtbPartitaMag().getPartitaMag()))).toList();
+                            (pickData != null && pickData.getMtbPartitaMag() != null && Objects.equals(x.getPartitaMag(), pickData.getMtbPartitaMag().getPartitaMag()))).toList();
 
             matchPickingObject = matchWithPartitaMag;
 
@@ -1125,16 +1125,19 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             if(item.getTempPickData() != null) {
                 PickingObjectDTO.PickData tmpPickData = item.getTempPickData();
 
-                if(!UtilityString.isNullOrEmpty(tmpPickData.getMtbPartitaMag().getPartitaMag())) {
-                    dto.setBatchLot(tmpPickData.getMtbPartitaMag().getPartitaMag());
-                }
+                if(tmpPickData.getMtbPartitaMag() != null) {
 
-                if(tmpPickData.getMtbPartitaMag().getDataScadD() != null){
-                    dto.setDataScad(tmpPickData.getMtbPartitaMag().getDataScadD());
-                    dto.setShouldAskDataScad(true);
-                }
+                    if (!UtilityString.isNullOrEmpty(tmpPickData.getMtbPartitaMag().getPartitaMag())) {
+                        dto.setBatchLot(tmpPickData.getMtbPartitaMag().getPartitaMag());
+                    }
 
-                batchLotEnabled = tmpPickData.getMtbPartitaMag().getFlagStato().equalsIgnoreCase("A");
+                    if (tmpPickData.getMtbPartitaMag().getDataScadD() != null) {
+                        dto.setDataScad(tmpPickData.getMtbPartitaMag().getDataScadD());
+                        dto.setShouldAskDataScad(true);
+                    }
+
+                    batchLotEnabled = tmpPickData.getMtbPartitaMag().getFlagStato().equalsIgnoreCase("A");
+                }
 
                 boolean useQtaDaEvadere;