From 9b1a00d09c7b463af43b301c8bcebd9e6d4a033a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 24 Feb 2023 16:02:19 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20su=20creazione=20nuova=20UDS=20nel=20?= =?UTF-8?q?caso=20in=20cui=20non=20=C3=A8=20presente=20la=20data=20cons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integrywmsnative/gest/spedizione/SpedizioneViewModel.java | 2 +- .../layout/fragment_main_ordini_uscita__list_group_model.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index 05c68167..1c300c3a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -1193,7 +1193,7 @@ public class SpedizioneViewModel { public void createNewLU(Integer customNumCollo, String customSerCollo, Runnable onComplete) { final List orders = Stream.of(this.mTestateOrdini) .map(x -> new CreateUDSRequestOrderDTO() - .setDataCons(UtilityDate.toLocalDate(x.getDataConsD())) + .setDataCons(x.getDataConsD() != null ? UtilityDate.toLocalDate(x.getDataConsD()) : null) .setDataOrd(UtilityDate.toLocalDate(x.getDataOrdD())) .setGestione(x.getGestione()) .setNumOrd(x.getNumOrd())) diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml index a5b55962..2d522cb1 100644 --- a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml +++ b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml @@ -77,7 +77,7 @@ android:layout_height="wrap_content" tools:text="Cod Jcom" android:layout_alignParentEnd="true" - android:layout_below="@id/right_descrizione" + android:layout_below="@id/descrizione" style="@style/AppTheme.NewMaterial.Text.Small" /> From a7f5f5f50552582d6c302763bf317ac6e394eff7 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 24 Feb 2023 16:03:03 +0100 Subject: [PATCH 2/2] -> v1.31.05 (339) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 76e82469..2ba7a2de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 338 - def appVersionName = '1.31.04' + def appVersionCode = 339 + def appVersionName = '1.31.05' signingConfigs { release {