diff --git a/app/build.gradle b/app/build.gradle index cf086d8a..f532c2f4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 532 - def appVersionName = '1.47.19' + def appVersionCode = 533 + def appVersionName = '1.47.20' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java index 03a1608f..4f35bb6d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java @@ -44,7 +44,7 @@ public class BottomSheetFragmentLUContentViewModel { if (collo == null) return; ObservableMtbTcol tipoPedana = collo.getMtbTCol(); - BigDecimal taraPedana = tipoPedana != null ? tipoPedana.getTaraKg() : BigDecimal.ZERO; + BigDecimal taraPedana = tipoPedana != null && tipoPedana.getTaraKg() != null ? tipoPedana.getTaraKg() : BigDecimal.ZERO; BigDecimal pesoNetto = BigDecimal.ZERO; for (MtbColr mtbColr : collo.getMtbColr()) {