conflict merge commit

app/build.gradle

@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 90
-    def appVersionName = '1.8.3'
+    def appVersionCode = 92
+    def appVersionName = '1.8.5'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java

@@ -297,6 +297,14 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS
         }
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        if(mRenderedOrderList != null && mRenderedOrderList.size() > 0) {
+            mHelper.deselectAll(mRenderedOrderList);
+        }
+    }
+
     @Override
     public void onFilterClick() {
 

app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java

@@ -1144,7 +1144,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                         dto.setShouldAskDataScad(true);
                     }
 
-                    batchLotEnabled = tmpPickData.getMtbPartitaMag().getFlagStato().equalsIgnoreCase("A");
+                    batchLotEnabled = tmpPickData.getMtbPartitaMag().getFlagStato() == null || tmpPickData.getMtbPartitaMag().getFlagStato().equalsIgnoreCase("A");
                 }
 
                 boolean useQtaDaEvadere;