From d4e7832f80cf819b99d713bc32bef18fbac0ec98 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 29 Mar 2023 16:46:25 +0200
Subject: [PATCH 1/2] Fix su ordinamento per data_scan in dialog di situazione
 articolo

---
 .../DialogInfoSituazioneArticoloView.java                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/row_info/info_situazione_articolo/DialogInfoSituazioneArticoloView.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/row_info/info_situazione_articolo/DialogInfoSituazioneArticoloView.java
index e0add105..827c02e6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/row_info/info_situazione_articolo/DialogInfoSituazioneArticoloView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/row_info/info_situazione_articolo/DialogInfoSituazioneArticoloView.java
@@ -119,7 +119,7 @@ public class DialogInfoSituazioneArticoloView extends BaseDialogRowInfoView {
             availableItems = new ArrayList<>();
 
         availableItems = Stream.of(availableItems)
-                .filter(x -> UtilityDate.isAfterToday(x.getDataScad()))
+                .filter(x -> x.getDataScad() == null || UtilityDate.isAfterToday(x.getDataScad()))
                 .toList();
 
         if(availableItems.isEmpty())
@@ -141,7 +141,7 @@ public class DialogInfoSituazioneArticoloView extends BaseDialogRowInfoView {
 
         var itemListCommessaNotMatchMatch = Stream.of(itemList)
                 .filter(dialogInfoSituazioneArticoloAvailableListItem -> !dialogInfoSituazioneArticoloAvailableListItem.isCommessaMatch())
-                .sortBy(x -> x.getDataScad())
+                .sortBy(x -> x.getDataScad() == null ? UtilityDate.getNow() : x.getDataScad())
                 .toList();
 
 

From c0b9496041b72b1bd2775d9e6045a3b8ba1bc9bf Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 29 Mar 2023 16:46:56 +0200
Subject: [PATCH 2/2] -> v1.32.23 (363)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ae3a16f8..c6e93043 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 362
-    def appVersionName = '1.32.22'
+    def appVersionCode = 363
+    def appVersionName = '1.32.23'
 
     signingConfigs {
         release {