Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/RefactoringGestioneColli

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-09-30 17:45:07 +02:00
parent cebd3b8a8f 15a946dfb6
commit e190e3de3b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
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 {

2
app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java
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()) {