Merge branch 'feature/RefactoringGestioneColli' into master-beta
Some checks failed
WMS - Android (New)/pipeline/head There was a failure building this commit

This commit is contained in:
2025-09-30 17:45:34 +02:00
2 changed files with 3 additions and 3 deletions

View File

@@ -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 {

View File

@@ -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()) {